🔧 Standardize CMake install destinations and library naming (shared support, MSVC exports, python setup consistency)

.github/workflows/build_wheels.yml

@@ -284,7 +284,7 @@ jobs:
     permissions:
       id-token: write
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v6
         with:
           # unpacks all CIBW artifacts into dist/
           pattern: cibw-*

.gitlab-ci.yml

@@ -61,7 +61,6 @@ build_idl84:
     - cp -r install/lib/python${PYTHON_VERSION}/site-packages/*uda* dist
 
     - export PYTHONPATH=dist:$PYTHONPATH
-    # - export LD_LIBRARY_PATH=install/lib:$LD_LIBRARY_PATH
     - module use install/modulefiles
     - UDA_MODULE=`ls install/modulefiles | grep uda`
     - module load $UDA_MODULE
@@ -76,6 +75,7 @@ build_idl84:
     - python3 -m pytest -v mastcodes/uda/python/tests/test_uda_meta.py
     - python3 -m pytest -v mastcodes/uda/python/tests/test_uda_signals.py
     - python3 -m pytest -v mastcodes/uda/python/tests/test_uda_xpad.py
+    - python3 mastcodes/uda/python/tests/test_put.py
   artifacts:
     paths:
       - dist

CMakeLists.txt

@@ -51,7 +51,7 @@ set( Boost_USE_MULTITHREADED OFF )
 # Version and Machine information
 
 # Set VERSION and FULL_VERSION from `git describe`
-# but use git export attribute for release tarballs 
+# but use git export attribute for release tarballs
 set( GIT_ARCHIVE_DESCRIBE [[$Format:%(describe)$]] )
 include( DetermineVersion )
 
@@ -109,16 +109,16 @@ endif()
 if( NOT WIN32 )
   set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -pthread -Wno-implicit-function-declaration" )
   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -pthread" )
-  
+
   if( MINGW )
     add_definitions( -DMINGW )
   endif()
-  
+
   if( GOPTION )
     message( "Compiling with g option to generate and embed debug information" )
     set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g" )
     set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g" )
-  endif() 
+  endif()
 endif()
 
 if( WIN32 AND NOT MINGW )
@@ -136,12 +136,12 @@ if( WIN32 OR MINGW )
   set( CMAKE_FIND_LIBRARY_PREFIXES "lib" "" )
   set( CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".dll.lib" ".a" ".lib" )
   if( MINGW )
-    set( IMPLIB_SUFFIX ".dll.a" )
+    set( IMPLIB_SUFFIX ".a" )
   else()
-    set( IMPLIB_SUFFIX ".dll.lib" )
+    set( IMPLIB_SUFFIX ".lib" )
   endif()
   find_package( XDR REQUIRED )
-  
+
   # "-Wl,-z,defs" is an ELF instruction, not supported by Windows
   string( REGEX REPLACE "-Wl,-z,defs" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}" )
 endif()
@@ -184,7 +184,7 @@ endif()
 if( SSLAUTHENTICATION )
   message( "Including SSL/RTL X509 User Authentication" )
   add_definitions( -DSSLAUTHENTICATION )
-endif() 
+endif()
 
 if( BUILD_SHARED_LIBS )
   message( "Build shared libraries asked" )
@@ -256,7 +256,7 @@ if( WIN32 OR MINGW )
     # otherwise it is not able to find files
     set( CPACK_NSIS_FULL_INSTALL "File /r \\\"\\\${INST_DIR_WIN}\\\\*.*\\\"" )
   endif()
-  
+
   set( CPACK_TEMPORARY_INSTALL_DIRECTORY "${CMAKE_BINARY_DIR}/cpack" )
   set( CPACK_PACKAGE_DIRECTORY "${CMAKE_WIN_BINARY_DIR}" )
   set( CPACK_TEMPORARY_DIRECTORY "${CMAKE_BINARY_DIR}/cpack" )

extlib/portablexdr-4.9.1/CMakeLists.txt

@@ -51,7 +51,9 @@ install(
 )
 
 install(
-    TARGETS ${PROJECT_NAME}
-    DESTINATION lib
+  TARGETS ${PROJECT_NAME}
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
 

source/bin/CMakeLists.txt

@@ -23,12 +23,12 @@ if( ENABLE_CAPNP )
 
   target_link_libraries( uda_cli PRIVATE serialisation-static )
   target_compile_definitions( uda_cli PRIVATE CAPNP_ENABLED=1 )
-  
+
   find_library( STDCXX_LIBRARY_FILE stdc++ HINTS ${CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES} )
   get_filename_component(STDCXX_LIBRARY_DIR ${STDCXX_LIBRARY_FILE} DIRECTORY )
-  
+
   if ( "${STDCXX_LIBRARY_DIR}" STREQUAL "" )
-    set ( STDCXX_RPATH "" ) 
+    set ( STDCXX_RPATH "" )
   else()
       set ( STDCXX_RPATH "-Wl,-rpath,${STDCXX_LIBRARY_DIR} -L${STDCXX_LIBRARY_DIR} -lstdc++" )
   endif()
@@ -41,13 +41,15 @@ if( ENABLE_CAPNP )
 
   set_target_properties( uda_cli
     PROPERTIES
-    LINK_FLAGS "${CAPNP_RPATH} ${STDCXX_RPATH}" 
+    LINK_FLAGS "${CAPNP_RPATH} ${STDCXX_RPATH}"
   )
 endif()
 
 install(
   TARGETS uda_cli
-  DESTINATION bin
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
   PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
 )
 

source/client/CMakeLists.txt

@@ -140,7 +140,7 @@ endif()
 if( NOT CLIENT_ONLY )
   add_library( fatclient-static STATIC ${FATCLIENT_OBJS} )
   target_link_libraries( fatclient-static PUBLIC plugins-static ${CLIENT_LINK_LIBS} )
-  
+
   if( BUILD_SHARED_LIBS )
     add_library( fatclient-shared SHARED ${FATCLIENT_OBJS} )
     target_link_libraries( fatclient-shared PUBLIC plugins-shared ${CLIENT_LINK_LIBS} )
@@ -149,11 +149,13 @@ endif()
 
 set_target_properties( client-static
   PROPERTIES
-    OUTPUT_NAME ${PROJECT_NAME}_client
+    OUTPUT_NAME ${PROJECT_NAME}_client_static
 )
 
 install( TARGETS client-static
-  DESTINATION lib
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
 
 if( BUILD_SHARED_LIBS )
@@ -172,7 +174,9 @@ if( BUILD_SHARED_LIBS )
   endif()
 
   install( TARGETS client-shared
-    DESTINATION lib
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
   )
 endif()
 
@@ -185,13 +189,15 @@ install( FILES ${HEADER_FILES}
 if( NOT CLIENT_ONLY )
   set_target_properties( fatclient-static
     PROPERTIES
-    OUTPUT_NAME fat${PROJECT_NAME}_client
+    OUTPUT_NAME fat${PROJECT_NAME}_client_static
   )
 
   install( TARGETS fatclient-static
-    DESTINATION lib
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
   )
-  
+
   if( BUILD_SHARED_LIBS )
     set_target_properties( fatclient-shared
       PROPERTIES
@@ -208,7 +214,9 @@ if( NOT CLIENT_ONLY )
     endif()
 
     install( TARGETS fatclient-shared
-      DESTINATION lib
+      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
   )
   endif()
 endif()

source/client2/CMakeLists.txt

@@ -139,7 +139,7 @@ endif()
 if( NOT CLIENT_ONLY )
   add_library( fatclient2-static STATIC ${FATCLIENT_OBJS} )
   target_link_libraries( fatclient2-static PRIVATE plugins-static ${CLIENT_LINK_LIBS} )
-  
+
   if( BUILD_SHARED_LIBS )
     add_library( fatclient2-shared SHARED ${FATCLIENT_OBJS} )
     target_link_libraries( fatclient2-shared PRIVATE plugins-shared ${CLIENT_LINK_LIBS} )
@@ -148,11 +148,13 @@ endif()
 
 set_target_properties( client2-static
   PROPERTIES
-    OUTPUT_NAME ${PROJECT_NAME}_client2
+    OUTPUT_NAME ${PROJECT_NAME}_client2_static
 )
 
 install( TARGETS client2-static
-  DESTINATION lib
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
 
 if( BUILD_SHARED_LIBS )
@@ -171,7 +173,9 @@ if( BUILD_SHARED_LIBS )
   endif()
 
   install( TARGETS client2-shared
-    DESTINATION lib
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
   )
 endif()
 
@@ -184,13 +188,15 @@ install( FILES ${HEADER_FILES}
 if( NOT CLIENT_ONLY )
   set_target_properties( fatclient2-static
     PROPERTIES
-    OUTPUT_NAME fat${PROJECT_NAME}_client2
+    OUTPUT_NAME fat${PROJECT_NAME}_client2_static
   )
 
   install( TARGETS fatclient2-static
-    DESTINATION lib
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
   )
-  
+
   if( BUILD_SHARED_LIBS )
     set_target_properties( fatclient2-shared
       PROPERTIES
@@ -207,7 +213,9 @@ if( NOT CLIENT_ONLY )
     endif()
 
     install( TARGETS fatclient2-shared
-      DESTINATION lib
+      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
   )
   endif()
 endif()

source/plugins/CMakeLists.txt

@@ -119,12 +119,14 @@ endif()
 
 set_target_properties( plugins-static
   PROPERTIES
-    OUTPUT_NAME ${PROJECT_NAME}_plugins
+    OUTPUT_NAME ${PROJECT_NAME}_plugins_static
 )
 
 install(
   TARGETS plugins-static
-  DESTINATION lib
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
 
 if( BUILD_SHARED_LIBS )
@@ -144,7 +146,9 @@ if( BUILD_SHARED_LIBS )
 
   install(
     TARGETS plugins-shared
-    DESTINATION lib
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
   )
 endif()