From d219280410ae4e6a6a66f6dabb3a81a481633f03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dietrich=20Kr=C3=B6nke?= Date: Fri, 9 Apr 2021 17:32:05 +0200 Subject: [PATCH] iox-#670 do not build shared libs on windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Dietrich Krönke --- iceoryx_binding_c/CMakeLists.txt | 4 +++- iceoryx_dds/CMakeLists.txt | 6 ++++-- iceoryx_posh/CMakeLists.txt | 7 +++++-- iceoryx_utils/CMakeLists.txt | 6 +++++- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/iceoryx_binding_c/CMakeLists.txt b/iceoryx_binding_c/CMakeLists.txt index a89ac726e38..11a6a349210 100644 --- a/iceoryx_binding_c/CMakeLists.txt +++ b/iceoryx_binding_c/CMakeLists.txt @@ -29,7 +29,9 @@ find_package(iceoryx_posh REQUIRED) include(IceoryxPackageHelper) include(IceoryxPlatform) -option(BUILD_SHARED_LIBS "Create shared libraries by default" ON) +if(NOT (WIN32)) + option(BUILD_SHARED_LIBS "Create shared libraries by default" ON) +endif() # ########## set variables for export ########## diff --git a/iceoryx_dds/CMakeLists.txt b/iceoryx_dds/CMakeLists.txt index 2ba320d5c85..6689afcd300 100644 --- a/iceoryx_dds/CMakeLists.txt +++ b/iceoryx_dds/CMakeLists.txt @@ -20,8 +20,6 @@ set(IOX_VERSION_STRING "0.99.7") project(iceoryx_dds VERSION ${IOX_VERSION_STRING}) -option(BUILD_SHARED_LIBS "Create shared libraries by default" ON) - if(NOT cpptoml_FOUND) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cpptoml/ ${CMAKE_BINARY_DIR}/dependencies/dds_gateway/cpptoml/prebuild) @@ -34,6 +32,10 @@ find_package(iceoryx_posh REQUIRED) include(IceoryxPackageHelper) include(IceoryxPlatform) +if(NOT (WIN32)) + option(BUILD_SHARED_LIBS "Create shared libraries by default" ON) +endif() + # ########## set variables for export ########## # diff --git a/iceoryx_posh/CMakeLists.txt b/iceoryx_posh/CMakeLists.txt index 2a20251c228..bb869c28f60 100644 --- a/iceoryx_posh/CMakeLists.txt +++ b/iceoryx_posh/CMakeLists.txt @@ -23,8 +23,6 @@ project(iceoryx_posh VERSION ${IOX_VERSION_STRING}) find_package(Threads REQUIRED) find_package(iceoryx_utils REQUIRED) -option(BUILD_SHARED_LIBS "Create shared libraries by default" ON) - option(TOML_CONFIG "TOML support for RouDi with dynamic configuration" ON) option(ONE_TO_MANY_ONLY "Restricts communication to 1:n pattern" OFF) @@ -40,6 +38,11 @@ include(IceoryxPlatform) include(cmake/iceoryx_posh_deployment.cmake) +if(NOT (WIN32)) + option(BUILD_SHARED_LIBS "Create shared libraries by default" ON) +endif() + + if(CLANG_TIDY) find_program( CLANG_TIDY_EXE diff --git a/iceoryx_utils/CMakeLists.txt b/iceoryx_utils/CMakeLists.txt index 7dac1199fed..bed1f08c3c6 100644 --- a/iceoryx_utils/CMakeLists.txt +++ b/iceoryx_utils/CMakeLists.txt @@ -26,11 +26,15 @@ set(IOX_VERSION_STRING "0.99.7") project(iceoryx_utils VERSION ${IOX_VERSION_STRING}) #adjust_version() -option(BUILD_SHARED_LIBS "Create shared libraries by default" ON) + include("${CMAKE_CURRENT_LIST_DIR}/cmake/IceoryxPackageHelper.cmake") include("${CMAKE_CURRENT_LIST_DIR}/cmake/IceoryxPlatform.cmake") +if(NOT (WIN32)) + option(BUILD_SHARED_LIBS "Create shared libraries by default" ON) +endif() + if(CLANG_TIDY) find_program( CLANG_TIDY_EXE