iox-eclipse-iceoryx#220 make dds and introspection client use ICEORYX…

…_CXX_STANDARD Signed-off-by: Mathias Kraus <[email protected]>
ApexAI · Nov 23, 2020 · 1a3f212 · 1a3f212
1 parent 652f76a
commit 1a3f212
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 6 deletions.
diff --git a/iceoryx_dds/CMakeLists.txt b/iceoryx_dds/CMakeLists.txt
@@ -55,7 +55,12 @@ add_library(iceoryx_dds
 )
 add_library(${PROJECT_NAMESPACE}::iceoryx_dds ALIAS iceoryx_dds)
 
-target_compile_options(iceoryx_dds PUBLIC -std=c++11)
+set_target_properties(iceoryx_utils PROPERTIES
+    CXX_STANDARD_REQUIRED ON
+    CXX_STANDARD ${ICEORYX_CXX_STANDARD}
+    POSITION_INDEPENDENT_CODE ON
+    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
+)
 
 target_include_directories(iceoryx_dds
     PUBLIC

diff --git a/tools/introspection/CMakeLists.txt b/tools/introspection/CMakeLists.txt
@@ -36,13 +36,19 @@ set(${PROJECT_NAME}_DIR ${CMAKE_CURRENT_LIST_DIR}/cmake
 )
 
 add_library(iceoryx_introspection
-            source/iceoryx_introspection_app.cpp
-            source/introspection_app.cpp
-    )
-set_property(TARGET iceoryx_introspection PROPERTY CXX_STANDARD 11)
+    source/iceoryx_introspection_app.cpp
+    source/introspection_app.cpp
+)
 
 add_library(${PROJECT_NAMESPACE}::iceoryx_introspection ALIAS iceoryx_introspection)
 
+set_target_properties(iceoryx_introspection PROPERTIES
+    CXX_STANDARD_REQUIRED ON
+    CXX_STANDARD ${ICEORYX_CXX_STANDARD}
+    POSITION_INDEPENDENT_CODE ON
+    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
+)
+
 target_include_directories(iceoryx_introspection
     PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
@@ -74,7 +80,13 @@ set_target_properties(iceoryx_introspection
 )
 
 add_executable(iox-introspection-client source/introspection_main.cpp)
-set_property(TARGET iox-introspection-client PROPERTY CXX_STANDARD 11)
+
+set_target_properties(iox-introspection-client PROPERTIES
+    CXX_STANDARD_REQUIRED ON
+    CXX_STANDARD ${ICEORYX_CXX_STANDARD}
+    POSITION_INDEPENDENT_CODE ON
+    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
+)
 
 target_link_libraries(iox-introspection-client
     PRIVATE