[cmake]: Fix usage after install when built with `BUILD_SHARED_LIBS=O…

…N` (#2016) * Force tcp_pubsub submodule to build static * Allow ecal-utils to be static or shared ecal-utils is used by other exported libraries (eg: ecalhdf5) which may be static or shared so there is no need to constrain ecal-utils, it should be consistent with other libraries * Force ThreadingUtils to be static implementation ThreadingUtils is only used internally by applications so it can be static and not exported/installed * Force EcalParser and QEcalParser to be static implementation libraries Both are only used by executables and aren't exported so they can be forced static * Force CustomQt to be static implementation library It is only used in applications and monitor plugins so it can be static * Bump tcp_pubsub submodule to get TCP_PUBSUB_LIBRARY_TYPE * Fail installer signing gracefully
eclipse-ecal · Feb 13, 2025 · c18fd66 · c18fd66
1 parent 91a1454
commit c18fd66
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 8 deletions.
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -377,6 +377,7 @@ jobs:
       working-directory: ${{ runner.workspace }}/_build/complete/_deploy
 
     - name: Determine name of the installer for zip file
+      if: env.IS_DOWNLOAD_AVAILABLE == 'true'
       shell: powershell
       run: |
         $INSTALLER_NAME = "${{ env.ASSET_NAME }}"

diff --git a/lib/CustomQt/CMakeLists.txt b/lib/CustomQt/CMakeLists.txt
@@ -66,7 +66,9 @@ set(custom_qt_src
   src/QToolTipMenu.cpp
 )
 
-add_library (${PROJECT_NAME}
+# CustomQt is only used for the implementation of the GUI applications and
+# monitor plugins so it can always be static and never installed/exported
+ecal_add_static_library(${PROJECT_NAME}
   ${custom_qt_includes}
   ${custom_qt_src}
 )
@@ -75,7 +77,7 @@ target_include_directories(${PROJECT_NAME}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
   PUBLIC  ${CMAKE_CURRENT_SOURCE_DIR}/include)
 
-target_link_libraries(${PROJECT_NAME}
+target_link_libraries(${PROJECT_NAME} PUBLIC
     Qt${QT_VERSION_MAJOR}::Core
     Qt${QT_VERSION_MAJOR}::Widgets
 )

diff --git a/lib/EcalParser/CMakeLists.txt b/lib/EcalParser/CMakeLists.txt
@@ -42,7 +42,9 @@ set(sources
     src/functions/username.h
 )
 
-add_library (${PROJECT_NAME} 
+# QEcalParser is an internal implementation detail for applications so it can
+# always be static and not installed/exported
+ecal_add_static_library(${PROJECT_NAME}
     ${includes}
     ${sources}
 )

diff --git a/lib/QEcalParser/CMakeLists.txt b/lib/QEcalParser/CMakeLists.txt
@@ -67,7 +67,9 @@ else()
 endif()
 
 
-add_library (${PROJECT_NAME}
+# QEcalParser is an internal implementation detail for applications so it can
+# always be static and not installed/exported
+ecal_add_static_library(${PROJECT_NAME}
     ${qecalparser_includes}
     ${qecalparser_src}
     ${qecalparser_ui}

diff --git a/lib/ThreadingUtils/CMakeLists.txt b/lib/ThreadingUtils/CMakeLists.txt
@@ -33,7 +33,10 @@ set(threading_utils_src
   src/dummy.cpp # Workaround to make this project generate an output. Header only librarys do not work well with Visual Studio
 )
 
-add_library (${PROJECT_NAME} 
+# WARNING: This is only used for the play and recorder applications (CLI and GUI)
+# so it is never needed by the SDK portion of the codebase and thus can be:
+# Internal implementation - not exported/installed
+ecal_add_static_library(${PROJECT_NAME}
   ${threading_utils_includes}
   ${threading_utils_src}
 )

diff --git a/lib/ecal_utils/CMakeLists.txt b/lib/ecal_utils/CMakeLists.txt
@@ -38,7 +38,7 @@ set(ecal_utils_src
     src/win_cp_changer.cpp
 )
 
-ecal_add_static_library(${PROJECT_NAME}
+ecal_add_library(${PROJECT_NAME}
     ${ecal_utils_includes}
     ${ecal_utils_src}
 )

diff --git a/thirdparty/tcp_pubsub/build-tcp_pubsub.cmake b/thirdparty/tcp_pubsub/build-tcp_pubsub.cmake
@@ -1,5 +1,11 @@
 include_guard(GLOBAL)
 
+# Build as static library
+set(TCP_PUBSUB_LIBRARY_TYPE STATIC)
+set(TCP_PUBSUB_USE_BUILTIN_ASIO OFF)
+set(TCP_PUBSUB_USE_BUILTIN_RECYCLE OFF)
+set(TCP_PUBSUB_BUILD_TESTS OFF)
+
 add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/tcp_pubsub/tcp_pubsub thirdparty/tcp_pubsub EXCLUDE_FROM_ALL SYSTEM)
 
-set_property(TARGET tcp_pubsub PROPERTY FOLDER thirdparty/tcp_pubsub)
+set_property(TARGET tcp_pubsub PROPERTY FOLDER thirdparty/tcp_pubsub)
diff --git a/thirdparty/tcp_pubsub/tcp_pubsub b/thirdparty/tcp_pubsub/tcp_pubsub
+13 −2		.github/workflows/build-macos.yml
+39 −39		.github/workflows/build-ubuntu.yml
+45 −13		.github/workflows/build-windows.yml
+7 −4		.gitmodules
+54 −4		CMakeLists.txt
+14 −0		README.md
+23 −4		tcp_pubsub/CMakeLists.txt
+0 −12		tcp_pubsub/sourcetree.cmake
+1 −1		tcp_pubsub/version.cmake
+36 −0		tests/tcp_pubsub_test/CMakeLists.txt
+194 −0		tests/tcp_pubsub_test/src/atomic_signalable.h
+314 −0		tests/tcp_pubsub_test/src/tcp_pubsub_test.cpp
+0 −1		thirdparty/asio
+1 −1		thirdparty/asio/Module/Findasio.cmake
+1 −0		thirdparty/asio/asio
+1 −0		thirdparty/asio/build-asio.cmake
+1 −0		thirdparty/gtest/Module/FindGTest.cmake
+19 −0		thirdparty/gtest/build-gtest.cmake
+1 −0		thirdparty/gtest/googletest
+0 −2		thirdparty/modules/Findrecycle.cmake
+1 −0		thirdparty/recycle/Module/Findrecycle.cmake
+5 −0		thirdparty/recycle/build-recycle.cmake
+0 −0		thirdparty/recycle/recycle
+1 −1		thirdparty/tcp_pubsub/Module/Findtcp_pubsub.cmake