mirror of
https://github.com/reactos/CMake.git
synced 2024-12-20 02:28:25 +00:00
Merge topic 'silence-vs6-warnings'
015309f
Tests/CompileDefinitions: Avoid spaces in defines on VS 6
This commit is contained in:
commit
7cde91cc8c
@ -5,6 +5,7 @@ project(CompileDefinitions)
|
||||
|
||||
if ("${CMAKE_GENERATOR}" STREQUAL "Visual Studio 6")
|
||||
add_definitions(-DNO_SPACES_IN_DEFINE_VALUES)
|
||||
set(NO_SPACES_IN_DEFINE_VALUES 1)
|
||||
endif()
|
||||
|
||||
# Use compile flags to tell executables which config is built
|
||||
|
@ -1,8 +1,15 @@
|
||||
|
||||
project(add_definitions_command)
|
||||
|
||||
add_definitions(-DCMAKE_IS_FUN -DCMAKE_IS=Fun -DCMAKE_IS_="Fun" -DCMAKE_IS_REALLY="Very Fun")
|
||||
add_definitions(-DCMAKE_IS_="Fun" -DCMAKE_IS_REALLY="Very Fun" -DCMAKE_IS_FUN -DCMAKE_IS=Fun)
|
||||
add_definitions(-DCMAKE_IS_FUN -DCMAKE_IS=Fun -DCMAKE_IS_="Fun")
|
||||
if (NOT NO_SPACES_IN_DEFINE_VALUES)
|
||||
add_definitions(-DCMAKE_IS_REALLY="Very Fun")
|
||||
endif()
|
||||
add_definitions(-DCMAKE_IS_="Fun")
|
||||
if (NOT NO_SPACES_IN_DEFINE_VALUES)
|
||||
add_definitions(-DCMAKE_IS_REALLY="Very Fun")
|
||||
endif()
|
||||
add_definitions(-DCMAKE_IS_FUN -DCMAKE_IS=Fun)
|
||||
add_definitions(-DBUILD_IS_DEBUG=$<CONFIG:Debug> -DBUILD_IS_NOT_DEBUG=$<NOT:$<CONFIG:Debug>>)
|
||||
|
||||
add_executable(add_definitions_command_executable ../compiletest.cpp)
|
||||
|
@ -7,7 +7,9 @@ add_executable(add_definitions_command_with_target_prop_executable ../compiletes
|
||||
|
||||
set_target_properties(add_definitions_command_with_target_prop_executable PROPERTIES COMPILE_DEFINITIONS CMAKE_IS_="Fun")
|
||||
|
||||
set_property(TARGET add_definitions_command_with_target_prop_executable APPEND PROPERTY COMPILE_DEFINITIONS CMAKE_IS_REALLY="Very Fun")
|
||||
if (NOT NO_SPACES_IN_DEFINE_VALUES)
|
||||
set_property(TARGET add_definitions_command_with_target_prop_executable APPEND PROPERTY COMPILE_DEFINITIONS CMAKE_IS_REALLY="Very Fun")
|
||||
endif()
|
||||
|
||||
add_definitions(-DCMAKE_IS_FUN)
|
||||
|
||||
|
@ -5,7 +5,11 @@ add_executable(target_prop_executable ../compiletest.cpp)
|
||||
|
||||
set_target_properties(target_prop_executable PROPERTIES COMPILE_DEFINITIONS CMAKE_IS_FUN)
|
||||
|
||||
set_property(TARGET target_prop_executable APPEND PROPERTY COMPILE_DEFINITIONS CMAKE_IS_REALLY="Very Fun" CMAKE_IS=Fun)
|
||||
if (NOT NO_SPACES_IN_DEFINE_VALUES)
|
||||
set_property(TARGET target_prop_executable APPEND PROPERTY COMPILE_DEFINITIONS CMAKE_IS_REALLY="Very Fun" CMAKE_IS=Fun)
|
||||
else()
|
||||
set_property(TARGET target_prop_executable APPEND PROPERTY COMPILE_DEFINITIONS CMAKE_IS=Fun)
|
||||
endif()
|
||||
set_property(TARGET target_prop_executable APPEND PROPERTY COMPILE_DEFINITIONS CMAKE_IS_FUN CMAKE_IS_="Fun")
|
||||
|
||||
set_property(TARGET target_prop_executable APPEND PROPERTY COMPILE_DEFINITIONS
|
||||
|
Loading…
Reference in New Issue
Block a user