Skip to content

Commit

Permalink
Include more dependencies of libcosim
Browse files Browse the repository at this point in the history
This change accompanies open-simulation-platform/libcosim#596, and
includes the other libraries which are now dynamically linked to
libcosim in the dist/lib folder.
  • Loading branch information
kyllingstad committed Jun 3, 2020
1 parent 043de62 commit d04af1d
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
8 changes: 8 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,14 @@ target_link_libraries(cosim
libcosim::cosim
Boost::program_options)

if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
# This makes the linker set RPATH rather than RUNPATH for the resulting
# binary, so that the indirect dependencies between dynamic libraries in
# our installation directory resolve correctly. (RPATH is transitive,
# RUNPATH is not.)
target_link_options(cosim PRIVATE "LINKER:--disable-new-dtags")
endif()

# ==============================================================================
# Installation
# ==============================================================================
Expand Down
8 changes: 8 additions & 0 deletions conanfile.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ lib, boost_regex*.dll -> ./dist/bin
lib, boost_system*.dll -> ./dist/bin
lib, boost_thread*.dll -> ./dist/bin
bin, cosim.dll -> ./dist/bin
bin, fmilib_shared.dll -> ./dist/bin
bin, xerces-c*.dll -> ./dist/lib
bin, yaml-cpp.dll -> ./dist/lib
bin, libzip.dll -> ./dist/lib

lib, libboost_atomic.so.* -> ./dist/lib
lib, libboost_chrono.so.* -> ./dist/lib
Expand All @@ -33,3 +37,7 @@ lib, libboost_regex.so.* -> ./dist/lib
lib, libboost_system.so.* -> ./dist/lib
lib, libboost_thread.so.* -> ./dist/lib
lib, libcosim.so -> ./dist/lib
lib, libfmilib_shared.so -> ./dist/lib
lib, libxerces-c*.so -> ./dist/lib
lib, libyaml-cpp.so.* -> ./dist/lib
lib, libzip.so.* -> ./dist/lib

0 comments on commit d04af1d

Please sign in to comment.