Skip to content

Commit

Permalink
iox-eclipse-iceoryx#670 do not build shared libs on windows
Browse files Browse the repository at this point in the history
Signed-off-by: Dietrich Krönke <[email protected]>
  • Loading branch information
dkroenke authored and marthtz committed May 12, 2021
1 parent c5e293f commit d219280
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 6 deletions.
4 changes: 3 additions & 1 deletion iceoryx_binding_c/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 ##########
Expand Down
6 changes: 4 additions & 2 deletions iceoryx_dds/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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 ##########
#
Expand Down
7 changes: 5 additions & 2 deletions iceoryx_posh/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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
Expand Down
6 changes: 5 additions & 1 deletion iceoryx_utils/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d219280

Please sign in to comment.