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

Build improvements #1032

Closed
wants to merge 2 commits into from
Closed

Build improvements #1032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bc1df3
Fix static building Fast-CDR with mingw
stefanct Dec 19, 2024
fc53960
[RFC] Allow for linking the PJ executable statically
stefanct Dec 19, 2024
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
4 changes: 3 additions & 1 deletion plotjuggler_app/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
option(EXE_STATIC "Link the PlotJuggler binary statically" OFF)

set (CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
Expand Down Expand Up @@ -119,7 +120,8 @@ target_link_libraries(plotjuggler
plotjuggler_base
plotjuggler_qwt
QCodeEditor
)
$<$<BOOL:${EXE_STATIC}>:-static-libgcc -static-libstdc++ -static>
)

if(COMPILING_WITH_CATKIN)

Expand Down
2 changes: 1 addition & 1 deletion plotjuggler_plugins/ParserROS/rosx_introspection/3rdparty/Fast-CDR/src/cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ set(${PROJECT_NAME}_source_files
exceptions/Exception.cpp
exceptions/LockedExternalAccessException.cpp
exceptions/NotEnoughMemoryException.cpp
FastCdr.rc
$<$<STREQUAL:$<TARGET_PROPERTY:${PROJECT_NAME},TYPE>,SHARED_LIBRARY>:FastCdr.rc>
)

configure_file(${PROJECT_SOURCE_DIR}/include/${PROJECT_NAME}/config.h.in
Expand Down
Loading