diff --git a/CMake/external_fastdds.cmake b/CMake/external_fastdds.cmake
index 7cd817544a..c3752ae41b 100644
--- a/CMake/external_fastdds.cmake
+++ b/CMake/external_fastdds.cmake
@@ -67,10 +67,6 @@ function(get_fastdds)
     message(CHECK_PASS "Done")
 endfunction()
 
-string(REPLACE "${ADDITIONAL_COMPILER_FLAGS}" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-string(REPLACE "${ADDITIONAL_COMPILER_FLAGS}" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
 # Trigger the FastDDS build
 get_fastdds()
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ADDITIONAL_COMPILER_FLAGS}")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ADDITIONAL_COMPILER_FLAGS}")
diff --git a/CMake/external_foonathan_memory.cmake b/CMake/external_foonathan_memory.cmake
index 2bd26fe1c6..41c56018f6 100644
--- a/CMake/external_foonathan_memory.cmake
+++ b/CMake/external_foonathan_memory.cmake
@@ -41,10 +41,6 @@ function(get_foonathan_memory)
 
 endfunction()
 
-string(REPLACE "${ADDITIONAL_COMPILER_FLAGS}" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-string(REPLACE "${ADDITIONAL_COMPILER_FLAGS}" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
 
 get_foonathan_memory()
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ADDITIONAL_COMPILER_FLAGS}")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ADDITIONAL_COMPILER_FLAGS}")
diff --git a/CMake/external_json.cmake b/CMake/external_json.cmake
index 5c55114e7a..dc76ec96cb 100644
--- a/CMake/external_json.cmake
+++ b/CMake/external_json.cmake
@@ -46,10 +46,6 @@ function(get_nlohmann_json)
 
 endfunction()
 
-string(REPLACE "${ADDITIONAL_COMPILER_FLAGS}" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-string(REPLACE "${ADDITIONAL_COMPILER_FLAGS}" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
 # Trigger the build
 get_nlohmann_json()
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ADDITIONAL_COMPILER_FLAGS}")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ADDITIONAL_COMPILER_FLAGS}")
diff --git a/CMake/external_libcurl.cmake b/CMake/external_libcurl.cmake
index 64f57b178a..0f8580d4f1 100644
--- a/CMake/external_libcurl.cmake
+++ b/CMake/external_libcurl.cmake
@@ -1,8 +1,5 @@
 if(CHECK_FOR_UPDATES)
 
-    string(REPLACE "${ADDITIONAL_COMPILER_FLAGS}" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-    string(REPLACE "${ADDITIONAL_COMPILER_FLAGS}" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-
     include(ExternalProject)
     message(STATUS "Building libcurl enabled")
     
@@ -64,6 +61,4 @@ if(CHECK_FOR_UPDATES)
         endif()
     endif()
 
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ADDITIONAL_COMPILER_FLAGS}")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ADDITIONAL_COMPILER_FLAGS}")
 endif() #CHECK_FOR_UPDATES
diff --git a/CMake/unix_config.cmake b/CMake/unix_config.cmake
index fdabb32a2d..245781ab55 100644
--- a/CMake/unix_config.cmake
+++ b/CMake/unix_config.cmake
@@ -93,6 +93,10 @@ macro(os_set_flags)
 	
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ADDITIONAL_COMPILER_FLAGS}")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ADDITIONAL_COMPILER_FLAGS}")
+	
+	
+    set_directory_properties(PROPERTIES DIRECTORY third-party/ COMPILE_OPTIONS "-w")
+    set_source_files_properties(third-party/*.* PROPERTIES COMPILE_OPTIONS "-w")
 
     #################
 	
diff --git a/CMake/windows_config.cmake b/CMake/windows_config.cmake
index 97244907e2..37cffdf50f 100644
--- a/CMake/windows_config.cmake
+++ b/CMake/windows_config.cmake
@@ -68,6 +68,10 @@ macro(os_set_flags)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ADDITIONAL_COMPILER_FLAGS}")
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ADDITIONAL_COMPILER_FLAGS}")
 		
+		
+        set_directory_properties(PROPERTIES DIRECTORY third-party/ COMPILE_OPTIONS "/W0")
+        set_source_files_properties(third-party/*.* PROPERTIES COMPILE_OPTIONS "/W0")
+		
         #################
         
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj /wd4819")
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e0a3f4283..467c844b09 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,8 +83,6 @@ global_target_config()
 
 include(CMake/install_config.cmake)
 
-string(REPLACE "${ADDITIONAL_COMPILER_FLAGS}" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-string(REPLACE "${ADDITIONAL_COMPILER_FLAGS}" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
 add_subdirectory(wrappers)
 if ( ( BUILD_EXAMPLES OR BUILD_PC_STITCHING ) AND BUILD_GLSL_EXTENSIONS )
     find_package(glfw3 3.3 QUIET)
@@ -95,8 +93,6 @@ if ( ( BUILD_EXAMPLES OR BUILD_PC_STITCHING ) AND BUILD_GLSL_EXTENSIONS )
     endif()
     add_subdirectory(src/gl)
 endif()
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ADDITIONAL_COMPILER_FLAGS}")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ADDITIONAL_COMPILER_FLAGS}")
 
 if(BUILD_EXAMPLES)
     add_subdirectory(examples)
diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt
index 6bf02b578e..c70314062e 100644
--- a/third-party/CMakeLists.txt
+++ b/third-party/CMakeLists.txt
@@ -1,8 +1,5 @@
 string(REPLACE ${PROJECT_SOURCE_DIR}/ "" _rel_path ${CMAKE_CURRENT_LIST_DIR})
 
-string(REPLACE "${ADDITIONAL_COMPILER_FLAGS}" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-string(REPLACE "${ADDITIONAL_COMPILER_FLAGS}" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-
 include(CMake/external_json.cmake)
 
 add_subdirectory( "${CMAKE_CURRENT_LIST_DIR}/rsutils" )
@@ -21,5 +18,3 @@ if( BUILD_WITH_DDS )
     add_subdirectory( "${CMAKE_CURRENT_LIST_DIR}/realdds" )
 endif()
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ADDITIONAL_COMPILER_FLAGS}")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ADDITIONAL_COMPILER_FLAGS}")