Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[cmake]: Fix usage after install when built with BUILD_SHARED_LIBS=ON #2016

Merged
merged 8 commits into from
Feb 13, 2025
Merged

[cmake]: Fix usage after install when built with BUILD_SHARED_LIBS=ON #2016

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0ac18df
Force tcp_pubsub submodule to build static
DownerCase Feb 12, 2025
1bad356
Allow ecal-utils to be static or shared
DownerCase Feb 12, 2025
c20f5f5
Force ThreadingUtils to be static implementation
DownerCase Feb 12, 2025
51fa7d5
Force EcalParser and QEcalParser to be static implementation libraries
DownerCase Feb 12, 2025
a94817f
Force CustomQt to be static implementation library
DownerCase Feb 12, 2025
c6968de
Bump tcp_pubsub submodule to get TCP_PUBSUB_LIBRARY_TYPE
DownerCase Feb 12, 2025
0f67a52
Don't use tcp_pubsub dep submodules
DownerCase Feb 12, 2025
4130be4
Fail installer signing gracefully
DownerCase Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Bump tcp_pubsub submodule to get TCP_PUBSUB_LIBRARY_TYPE
  • Loading branch information
@DownerCase
DownerCase committed Feb 12, 2025
commit c6968de23a190eaa63e1ab6a72cc8f2d72b6bee1
7 changes: 1 addition & 6 deletions thirdparty/tcp_pubsub/build-tcp_pubsub.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
include_guard(GLOBAL)

# Build as static library
set(BUILD_SHARED_LIBS_OLD ${BUILD_SHARED_LIBS})
set(BUILD_SHARED_LIBS OFF)
set(TCP_PUBSUB_LIBRARY_TYPE STATIC)

add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/tcp_pubsub/tcp_pubsub thirdparty/tcp_pubsub EXCLUDE_FROM_ALL SYSTEM)

# Reset static / shared libs to old value
set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_OLD})
unset(BUILD_SHARED_LIBS_OLD)

set_property(TARGET tcp_pubsub PROPERTY FOLDER thirdparty/tcp_pubsub)
2 changes: 1 addition & 1 deletion thirdparty/tcp_pubsub/tcp_pubsub
Open in desktop
Submodule tcp_pubsub updated 24 files
+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
Loading