diff --git a/Src/CMakeLists.txt b/Src/CMakeLists.txt index a34298e4f1fe160a928d814ccad9435dc4bd76b5..42c290de7a418927a7eafc8d9a8b04f8f7cdc496 100644 --- a/Src/CMakeLists.txt +++ b/Src/CMakeLists.txt @@ -22,7 +22,6 @@ target_link_libraries (${target} robofish-behavior_loader) find_package(Qt5 REQUIRED COMPONENTS Core Gui Xml Network Widgets Multimedia MultimediaWidgets OpenGL) target_link_libraries (${target} Qt5::Core Qt5::Gui Qt5::Xml Qt5::Network Qt5::Widgets Qt5::Multimedia Qt5::MultimediaWidgets Qt5::OpenGL) -set(Boost_REALPATH ON) find_package(Boost REQUIRED COMPONENTS system filesystem program_options) target_link_libraries(${target} Boost::headers Boost::system Boost::filesystem Boost::program_options) @@ -75,8 +74,6 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") deploy_qt5(${target} DESTINATION .) endif() - locate_boost(shared_libraries COMPONENTS system filesystem program_options) - set(INSTALL_CUDA_COMPONENTS "" CACHE STRING "CUDA components to install") locate_cuda(shared_libraries COMPONENTS ${INSTALL_CUDA_COMPONENTS}) @@ -140,8 +137,6 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") install(DIRECTORY "${Pylon5_LIBRARY_DIR}/" DESTINATION "${CMAKE_INSTALL_LIBDIR}") endif() - install(FILES "${Boost_SYSTEM_LIBRARY_RELEASE}" "${Boost_FILESYSTEM_LIBRARY_RELEASE}" "${Boost_PROGRAM_OPTIONS_LIBRARY_RELEASE}" DESTINATION "${CMAKE_INSTALL_LIBDIR}") - get_target_property(shared_library biotracker-interfaces LOCATION) install(FILES "${shared_library}" DESTINATION "${CMAKE_INSTALL_LIBDIR}") diff --git a/ci/configure.py b/ci/configure.py index 0aa461b8429a77998d3b43a82f061e32b0f5b6b9..dc511ef98616d2ccb2f541c1b4ced75674abf636 100755 --- a/ci/configure.py +++ b/ci/configure.py @@ -67,6 +67,8 @@ if __name__ == "__main__": command += define("CMAKE_SKIP_PACKAGE_ALL_DEPENDENCY", "ON") command += define_env("VCPKG_TARGET_TRIPLET") + command += define("Boost_USE_STATIC_LIBS", "ON") + if system() == "Windows": command += define("PACKAGE_MSI", "ON") command += define("INSTALL_SYSTEM_LIBRARIES", "ON")