Skip to content

Commit e76f30e

Browse files
committed
try another way to ignore rsutils
1 parent 80640ea commit e76f30e

File tree

4 files changed

+3
-10
lines changed

4 files changed

+3
-10
lines changed

CMake/unix_config.cmake

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,6 @@ macro(os_set_flags)
8888
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SECURITY_COMPILER_FLAGS}")
8989

9090
set(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} -pie")
91-
92-
set_directory_properties(PROPERTIES DIRECTORY third-party/ COMPILE_OPTIONS "-w")
93-
set_source_files_properties(third-party/*.* PROPERTIES COMPILE_OPTIONS "-w")
94-
set_directory_properties(PROPERTIES DIRECTORY third-party/rsutils/ COMPILE_OPTIONS "")
95-
set_source_files_properties(third-party/rsutils/*.* PROPERTIES COMPILE_OPTIONS "")
9691

9792
endif()
9893

CMake/windows_config.cmake

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,6 @@ macro(os_set_flags)
7373
set(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} /INCREMENTAL:NO /LTCG /NXCOMPAT") # ignoring '/INCREMENTAL' due to '/LTCG' specification
7474
endif()
7575

76-
set_directory_properties(PROPERTIES DIRECTORY third-party/ COMPILE_OPTIONS "/W0")
77-
set_source_files_properties(third-party/*.* PROPERTIES COMPILE_OPTIONS "/W0")
78-
set_directory_properties(PROPERTIES DIRECTORY third-party/rsutils/ COMPILE_OPTIONS "")
79-
set_source_files_properties(third-party/rsutils/*.* PROPERTIES COMPILE_OPTIONS "")
80-
8176
#################
8277

8378
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj /wd4819")

third-party/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ include(CMake/external_json.cmake)
44

55
add_subdirectory( "${CMAKE_CURRENT_LIST_DIR}/rsutils" )
66

7+
set_directory_properties(PROPERTIES DIRECTORY . COMPILE_OPTIONS "")
8+
79
# Add additional include directories to allow file to include rosbag headers
810
include(${_rel_path}/realsense-file/config.cmake)
911

third-party/rsutils/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
cmake_minimum_required(VERSION 3.8.0) # source_group(TREE)
44
project( rsutils )
55

6+
set_directory_properties(PROPERTIES DIRECTORY . COMPILE_OPTIONS "-w")
67
add_library( ${PROJECT_NAME} STATIC "" )
78
# We cannot directly interface with nlohmann_json (doesn't work on bionic)
89
#target_link_libraries( ${PROJECT_NAME} PUBLIC nlohmann_json )

0 commit comments

Comments
 (0)