[ros-diffs] [reactos] 01/01: [CMAKE] target_compile_definitions() calls: Remove (now) useless '-D' (#3490)

[Serge Gautherie]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=55b93aecdc1f881b92914…

commit 55b93aecdc1f881b9291428189c625ff1def6774
Author:     Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com>
AuthorDate: Wed Mar 3 04:16:02 2021 +0100
Commit:     GitHub <noreply(a)github.com>
CommitDate: Wed Mar 3 04:16:02 2021 +0100

    [CMAKE] target_compile_definitions() calls: Remove (now) useless '-D' (#3490)
    
    Documented as automatically removed, since CMake 3.12.4 at least.
    https://cmake.org/cmake/help/v3.12/command/target_compile_definitions.html
---
 dll/directx/wine/d3dx9_36/d3dx9.cmake                  | 2 +-
 modules/rosapps/applications/fraginator/CMakeLists.txt | 2 +-
 modules/rostests/winetests/d3dx9_36/CMakeLists.txt     | 2 +-
 sdk/lib/rossym/CMakeLists.txt                          | 2 +-
 sdk/tools/mkhive/CMakeLists.txt                        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dll/directx/wine/d3dx9_36/d3dx9.cmake
b/dll/directx/wine/d3dx9_36/d3dx9.cmake
index 082c03e5201..2354a5b4ed7 100644
--- a/dll/directx/wine/d3dx9_36/d3dx9.cmake
+++ b/dll/directx/wine/d3dx9_36/d3dx9.cmake
@@ -45,5 +45,5 @@ function(add_d3dx9_target __version)
     add_pch(${module} ../d3dx9_36/precomp.h "${PCH_SKIP_SOURCE}")
     add_cd_file(TARGET ${module} DESTINATION reactos/system32 FOR all)
 
-    target_compile_definitions(${module} PRIVATE -DD3DX_SDK_VERSION=${__version}
-D__WINESRC__ -Dcopysignf=_copysignf)
+    target_compile_definitions(${module} PRIVATE D3DX_SDK_VERSION=${__version}
__WINESRC__ copysignf=_copysignf)
 endfunction()
diff --git a/modules/rosapps/applications/fraginator/CMakeLists.txt
b/modules/rosapps/applications/fraginator/CMakeLists.txt
index 17d7d28037c..77d46795308 100644
--- a/modules/rosapps/applications/fraginator/CMakeLists.txt
+++ b/modules/rosapps/applications/fraginator/CMakeLists.txt
@@ -19,7 +19,7 @@ add_cd_file(TARGET frag DESTINATION reactos/system32 FOR all)
 add_executable(unfrag ${UNFRAG_SOURCE})
 target_link_libraries(unfrag cppstl)
 set_target_cpp_properties(unfrag WITH_EXCEPTIONS)
-target_compile_definitions(unfrag PRIVATE "_CUI_")
+target_compile_definitions(unfrag PRIVATE _CUI_)
 set_module_type(unfrag win32cui UNICODE)
 add_importlibs(unfrag advapi32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET unfrag DESTINATION reactos/system32 FOR all)
diff --git a/modules/rostests/winetests/d3dx9_36/CMakeLists.txt
b/modules/rostests/winetests/d3dx9_36/CMakeLists.txt
index 1f4156ce271..3761ad27697 100644
--- a/modules/rostests/winetests/d3dx9_36/CMakeLists.txt
+++ b/modules/rostests/winetests/d3dx9_36/CMakeLists.txt
@@ -13,7 +13,7 @@ add_executable(d3dx9_36_winetest
     xfile.c
     testlist.c
     rsrc.rc)
-target_compile_definitions(d3dx9_36_winetest PRIVATE -DUSE_WINE_TODOS -D__WINESRC__
-Disnan=_isnan)
+target_compile_definitions(d3dx9_36_winetest PRIVATE USE_WINE_TODOS __WINESRC__
isnan=_isnan)
 if(MSVC)
     # Disable warning C4477 (printf format warnings)
     remove_target_compile_option(d3dx9_36_winetest "/we4477")
diff --git a/sdk/lib/rossym/CMakeLists.txt b/sdk/lib/rossym/CMakeLists.txt
index e04cdbdedb2..e70b87bb512 100644
--- a/sdk/lib/rossym/CMakeLists.txt
+++ b/sdk/lib/rossym/CMakeLists.txt
@@ -13,4 +13,4 @@ list(APPEND SOURCE
     zwfile.c)
 add_library(rossym ${SOURCE})
 add_dependencies(rossym psdk bugcodes)
-target_compile_definitions(rossym INTERFACE "-D__ROS_ROSSYM__")
+target_compile_definitions(rossym INTERFACE __ROS_ROSSYM__)
diff --git a/sdk/tools/mkhive/CMakeLists.txt b/sdk/tools/mkhive/CMakeLists.txt
index eb840ba9dab..da2560165dc 100644
--- a/sdk/tools/mkhive/CMakeLists.txt
+++ b/sdk/tools/mkhive/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
 
 add_host_tool(mkhive ${SOURCE})
 target_include_directories(mkhive PRIVATE ${REACTOS_SOURCE_DIR}/sdk/lib/rtl)
-target_compile_definitions(mkhive PRIVATE -DMKHIVE_HOST)
+target_compile_definitions(mkhive PRIVATE MKHIVE_HOST)
 if(NOT MSVC)
     target_compile_options(mkhive PRIVATE "-fshort-wchar")
 endif()