move security flags change into projects' cmake

IntelRealSense · Oct 30, 2024 · 6b0b06a · 6b0b06a
1 parent 4ce2041
commit 6b0b06a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/CMake/external_fastdds.cmake b/CMake/external_fastdds.cmake
@@ -67,7 +67,10 @@ function(get_fastdds)
     message(CHECK_PASS "Done")
 endfunction()
 
+
+pop_security_flags()
+
 # Trigger the FastDDS build
 get_fastdds()
 
-
+push_security_flags()
diff --git a/CMake/external_foonathan_memory.cmake b/CMake/external_foonathan_memory.cmake
@@ -41,4 +41,8 @@ function(get_foonathan_memory)
 
 endfunction()
 
+pop_security_flags()
+
 get_foonathan_memory()
+
+push_security_flags()
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -63,16 +63,12 @@ target_link_libraries( ${LRS_TARGET} PUBLIC rsutils )
 
 if(BUILD_WITH_DDS)
     if (CMAKE_SYSTEM MATCHES "Windows" OR CMAKE_SYSTEM MATCHES "Linux")
-
-        pop_security_flags()
 
         message(STATUS "Building with FastDDS")
         include(CMake/external_foonathan_memory.cmake)
         include(CMake/external_fastdds.cmake)
 
         target_link_libraries( ${LRS_TARGET} PRIVATE realdds )
-
-        push_security_flags()
 
     else()
         MESSAGE(STATUS "Turning off `BUILD_WITH_DDS` as it's only supported on Windows & Linux and not on ${CMAKE_SYSTEM}")

diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt
@@ -3,7 +3,7 @@ string(REPLACE ${PROJECT_SOURCE_DIR}/ "" _rel_path ${CMAKE_CURRENT_LIST_DIR})
 
 add_subdirectory( "${CMAKE_CURRENT_LIST_DIR}/rsutils" )
 
-pop_security_flags()
+pop_security_flags() # remove security flags for third party, as we cannot guarantee their security enforcment
 
 include(CMake/external_json.cmake)
 # Add additional include directories to allow file to include rosbag headers