try another way to ignore rsutils

IntelRealSense · Oct 10, 2024 · e76f30e · e76f30e
1 parent 80640ea
commit e76f30e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 10 deletions.
diff --git a/CMake/unix_config.cmake b/CMake/unix_config.cmake
@@ -88,11 +88,6 @@ macro(os_set_flags)
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SECURITY_COMPILER_FLAGS}")
 
         set(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} -pie")
-
-        set_directory_properties(PROPERTIES DIRECTORY third-party/ COMPILE_OPTIONS "-w")
-        set_source_files_properties(third-party/*.* PROPERTIES COMPILE_OPTIONS "-w")
-        set_directory_properties(PROPERTIES DIRECTORY third-party/rsutils/ COMPILE_OPTIONS "")
-        set_source_files_properties(third-party/rsutils/*.* PROPERTIES COMPILE_OPTIONS "")
 
     endif()
 

diff --git a/CMake/windows_config.cmake b/CMake/windows_config.cmake
@@ -73,11 +73,6 @@ macro(os_set_flags)
             set(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} /INCREMENTAL:NO /LTCG /NXCOMPAT") # ignoring '/INCREMENTAL' due to '/LTCG' specification
         endif()
 
-        set_directory_properties(PROPERTIES DIRECTORY third-party/ COMPILE_OPTIONS "/W0")
-        set_source_files_properties(third-party/*.* PROPERTIES COMPILE_OPTIONS "/W0")
-        set_directory_properties(PROPERTIES DIRECTORY third-party/rsutils/ COMPILE_OPTIONS "")
-        set_source_files_properties(third-party/rsutils/*.* PROPERTIES COMPILE_OPTIONS "")
-
         #################
 
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj /wd4819")

diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt
@@ -4,6 +4,8 @@ include(CMake/external_json.cmake)
 
 add_subdirectory( "${CMAKE_CURRENT_LIST_DIR}/rsutils" )
 
+set_directory_properties(PROPERTIES DIRECTORY . COMPILE_OPTIONS "")
+
 # Add additional include directories to allow file to include rosbag headers
 include(${_rel_path}/realsense-file/config.cmake)
 

diff --git a/third-party/rsutils/CMakeLists.txt b/third-party/rsutils/CMakeLists.txt
@@ -3,6 +3,7 @@
 cmake_minimum_required(VERSION 3.8.0)  # source_group(TREE)
 project( rsutils )
 
+set_directory_properties(PROPERTIES DIRECTORY . COMPILE_OPTIONS "-w")
 add_library( ${PROJECT_NAME} STATIC "" )
 # We cannot directly interface with nlohmann_json (doesn't work on bionic)
 #target_link_libraries( ${PROJECT_NAME} PUBLIC nlohmann_json )