https://git.reactos.org/?p=reactos.git;a=commitdiff;h=44662eaf621860d0cf9da1b55b3a1a14e1ba0010
commit 44662eaf621860d0cf9da1b55b3a1a14e1ba0010
Author: Serge Gautherie <reactos-git_serge_171...@gautherie.fr>
AuthorDate: Mon Jun 3 17:52:29 2024 +0200
Commit: Timo Kreuzer <timo.kreu...@reactos.org>
CommitDate: Wed Aug 21 11:34:48 2024 +0300
[CMAKE] Use COMPILE_OPTIONS instead of superseded COMPILE_FLAGS
for set_source_files_properties().
---
boot/freeldr/freeldr/pcat.cmake | 2 +-
dll/directx/wine/ddraw/CMakeLists.txt | 2 +-
dll/opengl/glu32/CMakeLists.txt | 2 +-
dll/win32/kernel32/CMakeLists.txt | 6 +++---
dll/win32/windowscodecs/CMakeLists.txt | 2 +-
drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt | 2 +-
modules/rostests/apitests/ntdll/CMakeLists.txt | 2 +-
modules/rostests/apitests/rtl/CMakeLists.txt | 2 +-
sdk/lib/rtl/CMakeLists.txt | 2 +-
win32ss/user/winsrv/consrv.cmake | 4 ++--
10 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/boot/freeldr/freeldr/pcat.cmake b/boot/freeldr/freeldr/pcat.cmake
index 177d5a3adba..0a9c96cdee5 100644
--- a/boot/freeldr/freeldr/pcat.cmake
+++ b/boot/freeldr/freeldr/pcat.cmake
@@ -82,7 +82,7 @@ if(ARCH STREQUAL "i386")
arch/i386/xbox/xboxvideo.c)
if(NOT MSVC)
# Prevent a warning when doing a memcmp with address 0
- set_source_files_properties(arch/i386/xbox/xboxmem.c PROPERTIES
COMPILE_FLAGS "-Wno-nonnull")
+ set_source_files_properties(arch/i386/xbox/xboxmem.c PROPERTIES
COMPILE_OPTIONS "-Wno-nonnull")
endif()
elseif(SARCH STREQUAL "pc98")
diff --git a/dll/directx/wine/ddraw/CMakeLists.txt
b/dll/directx/wine/ddraw/CMakeLists.txt
index 4ac3ca28690..824633ebff0 100644
--- a/dll/directx/wine/ddraw/CMakeLists.txt
+++ b/dll/directx/wine/ddraw/CMakeLists.txt
@@ -27,7 +27,7 @@ list(APPEND SOURCE
if(MSVC)
# FIXME: http://www.cmake.org/Bug/view.php?id=12998
#target_compile_options(ddraw PRIVATE "/FIwine/typeof.h")
- set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS
"/FIwine/typeof.h")
+ set_source_files_properties(${SOURCE} PROPERTIES COMPILE_OPTIONS
"/FIwine/typeof.h")
endif()
add_library(ddraw MODULE
diff --git a/dll/opengl/glu32/CMakeLists.txt b/dll/opengl/glu32/CMakeLists.txt
index 76ace8871bf..f60619510b6 100644
--- a/dll/opengl/glu32/CMakeLists.txt
+++ b/dll/opengl/glu32/CMakeLists.txt
@@ -124,7 +124,7 @@ if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
target_compile_options(glu32 PRIVATE -Wno-write-strings)
target_compile_options(glu32 PRIVATE -Wno-unused-but-set-variable)
# Prevent a warning when comparing 'this' against 0
- set_source_files_properties(src/libnurbs/internals/arc.cc PROPERTIES
COMPILE_FLAGS "-Wno-nonnull-compare")
+ set_source_files_properties(src/libnurbs/internals/arc.cc PROPERTIES
COMPILE_OPTIONS "-Wno-nonnull-compare")
endif()
if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
diff --git a/dll/win32/kernel32/CMakeLists.txt
b/dll/win32/kernel32/CMakeLists.txt
index ba56d1ffeee..4661ef9b0cb 100644
--- a/dll/win32/kernel32/CMakeLists.txt
+++ b/dll/win32/kernel32/CMakeLists.txt
@@ -94,13 +94,13 @@ list(APPEND SOURCE
if(MSVC)
# Disable warning C4146: unary minus operator applied to unsigned type,
result still unsigned
- set_source_files_properties(wine/res.c PROPERTIES COMPILE_FLAGS /wd4146)
+ set_source_files_properties(wine/res.c PROPERTIES COMPILE_OPTIONS
"/wd4146")
# Disable warning C4267: 'initializing': conversion from 'size_t' to
'DWORD', possible loss of data
- set_source_files_properties(winnls/string/locale.c PROPERTIES
COMPILE_FLAGS /wd4267)
+ set_source_files_properties(winnls/string/locale.c PROPERTIES
COMPILE_OPTIONS "/wd4267")
else()
# Disable warning: 'variable' defined but not used
- set_source_files_properties(winnls/string/locale.c PROPERTIES
COMPILE_FLAGS -Wno-unused-variable)
+ set_source_files_properties(winnls/string/locale.c PROPERTIES
COMPILE_OPTIONS "-Wno-unused-variable")
endif()
if(ARCH STREQUAL "i386")
diff --git a/dll/win32/windowscodecs/CMakeLists.txt
b/dll/win32/windowscodecs/CMakeLists.txt
index d4fc4b281b2..ee7ff716e3b 100644
--- a/dll/win32/windowscodecs/CMakeLists.txt
+++ b/dll/win32/windowscodecs/CMakeLists.txt
@@ -52,7 +52,7 @@ if(MSVC)
if(ARCH STREQUAL "i386")
list(APPEND SOURCE msvc-thiscall.c)
endif()
- set_source_files_properties(bitmap.c PROPERTIES COMPILE_FLAGS "/FImsvc.h")
+ set_source_files_properties(bitmap.c PROPERTIES COMPILE_OPTIONS
"/FImsvc.h")
list(APPEND PCH_SKIP_SOURCE bitmap.c)
else()
list(APPEND SOURCE bitmap.c)
diff --git a/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt
b/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt
index 61cf0185783..30700176df0 100644
--- a/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt
+++ b/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt
@@ -4,7 +4,7 @@ include_directories(..)
add_executable(cmicontrol main.cpp window.rc)
if(NOT MSVC)
- set_source_files_properties(main.cpp PROPERTIES COMPILE_FLAGS
"-Wno-write-strings")
+ set_source_files_properties(main.cpp PROPERTIES COMPILE_OPTIONS
"-Wno-write-strings")
endif()
add_dependencies(cmicontrol psdk)
diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt
b/modules/rostests/apitests/ntdll/CMakeLists.txt
index 9b3b4b1ddc1..6f956813680 100644
--- a/modules/rostests/apitests/ntdll/CMakeLists.txt
+++ b/modules/rostests/apitests/ntdll/CMakeLists.txt
@@ -137,7 +137,7 @@ add_pch(ntdll_apitest precomp.h "${PCH_SKIP_SOURCE}")
add_dependencies(ntdll_apitest load_notifications)
if(NOT MSVC)
- set_source_files_properties(RtlGetFullPathName_UstrEx.c PROPERTIES
COMPILE_FLAGS "-Wno-format")
+ set_source_files_properties(RtlGetFullPathName_UstrEx.c PROPERTIES
COMPILE_OPTIONS "-Wno-format")
endif()
add_rostests_file(TARGET ntdll_apitest)
diff --git a/modules/rostests/apitests/rtl/CMakeLists.txt
b/modules/rostests/apitests/rtl/CMakeLists.txt
index 887a5eddd71..1eb33d0e7c7 100644
--- a/modules/rostests/apitests/rtl/CMakeLists.txt
+++ b/modules/rostests/apitests/rtl/CMakeLists.txt
@@ -37,7 +37,7 @@ target_compile_definitions(rtl_test_lib PRIVATE _RTL_TEST
_NTSYSTEM_)
add_dependencies(rtl_test_lib asm)
if(NOT MSVC)
- set_source_files_properties(RtlGetFullPathName_UstrEx.c PROPERTIES
COMPILE_FLAGS "-Wno-format")
+ set_source_files_properties(RtlGetFullPathName_UstrEx.c PROPERTIES
COMPILE_OPTIONS "-Wno-format")
endif()
# RTL tests with static linkage (called unittest, so it won't run in
rosautotest)
diff --git a/sdk/lib/rtl/CMakeLists.txt b/sdk/lib/rtl/CMakeLists.txt
index 28321a868e9..a37e1ab9407 100644
--- a/sdk/lib/rtl/CMakeLists.txt
+++ b/sdk/lib/rtl/CMakeLists.txt
@@ -18,7 +18,7 @@ list(APPEND RTL_WINE_SOURCE
if(MSVC)
# Silence warning C4267: 'initializing': conversion from 'size_t' to
'const int', possible loss of data
- set_source_files_properties(${RTL_WINE_SOURCE} PROPERTIES COMPILE_FLAGS
/wd4267)
+ set_source_files_properties(${RTL_WINE_SOURCE} PROPERTIES COMPILE_OPTIONS
"/wd4267")
endif()
list(APPEND SOURCE
diff --git a/win32ss/user/winsrv/consrv.cmake b/win32ss/user/winsrv/consrv.cmake
index dd4b6da03c2..116333c40fc 100644
--- a/win32ss/user/winsrv/consrv.cmake
+++ b/win32ss/user/winsrv/consrv.cmake
@@ -46,10 +46,10 @@ list(APPEND CONSRV_SOURCE
if(MSVC)
## NOTE: No need to specify it as we use MSVC :)
##target_compile_options(consrv PRIVATE "/Ze")
- #set_source_files_properties(${CONSRV_SOURCE} PROPERTIES COMPILE_FLAGS
"/Ze")
+ #set_source_files_properties(${CONSRV_SOURCE} PROPERTIES COMPILE_OPTIONS
"/Ze")
else()
#target_compile_options(consrv PRIVATE "-fms-extensions")
- set_source_files_properties(${CONSRV_SOURCE} PROPERTIES COMPILE_FLAGS
"-fms-extensions")
+ set_source_files_properties(${CONSRV_SOURCE} PROPERTIES COMPILE_OPTIONS
"-fms-extensions")
endif()
add_library(consrv ${CONSRV_SOURCE})
