mirror of
https://github.com/reactos/reactos.git
synced 2024-11-11 01:04:11 +00:00
[CMAKE] Use COMPILE_OPTIONS instead of superseded COMPILE_FLAGS
for set_source_files_properties().
This commit is contained in:
parent
fbcbbd8768
commit
44662eaf62
10 changed files with 13 additions and 13 deletions
|
@ -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")
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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")
|
||||
|
|
|
@ -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")
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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})
|
||||
|
|
Loading…
Reference in a new issue