diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2016-02-01 05:47:25 +0300 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2016-02-01 11:26:26 +0300 |
| commit | d30602c7cbec7e3e670cf8de3de6e5becb9d4470 (patch) | |
| tree | 8f06b2909514dff058bc55d1049a7dbd430d95f5 /src/Native/CMakeLists.txt | |
| parent | 44ff6e0c334ccc399620e945ae0345530822d959 (diff) | |
Fix inconsistent WIN32 define uses
_WIN32 is predefined by Windows compilers. We have been using it in most places already,
change the remaining few to use it as well.
Delete WIN32 since it became unused, as well as a few other defines.
Diffstat (limited to 'src/Native/CMakeLists.txt')
| -rw-r--r-- | src/Native/CMakeLists.txt | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/Native/CMakeLists.txt b/src/Native/CMakeLists.txt index 3ac29f6a4..83ccad224 100644 --- a/src/Native/CMakeLists.txt +++ b/src/Native/CMakeLists.txt @@ -152,7 +152,6 @@ endfunction(get_compile_definitions) if(CLR_CMAKE_PLATFORM_ARCH_AMD64) add_definitions(-D_TARGET_AMD64_=1) add_definitions(-D_AMD64_) - add_definitions(-DAMD64) elseif(CLR_CMAKE_PLATFORM_ARCH_I386) add_definitions(-D_TARGET_X86_=1) add_definitions(-D_X86_) @@ -173,23 +172,16 @@ function(convert_to_absolute_path RetSources) set(Sources ${ARGN}) foreach(Source IN LISTS Sources) list(APPEND AbsolutePathSources ${CMAKE_CURRENT_SOURCE_DIR}/${Source}) - endforeach() + endforeach() set(${RetSources} ${AbsolutePathSources} PARENT_SCOPE) endfunction(convert_to_absolute_path) if(WIN32) - add_definitions(-DWIN32) - add_definitions(-D_WIN32=1) - if(IS_64BIT_BUILD) - add_definitions(-D_WIN64=1) - endif() add_definitions(-DUNICODE=1) add_compile_options($<$<CONFIG:Debug>:-DDEBUG>) - add_compile_options(/Zi) # enable debugging information add_compile_options($<$<CONFIG:Debug>:/MTd>) add_compile_options($<$<CONFIG:Release>:/MT>) - add_compile_options($<$<CONFIG:RelWithDefInfo>:/MT>) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /PDBCOMPRESS") #shrink pdb size + add_compile_options(/Zi) # enable debugging information set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEBUG") else(WIN32) string(TOUPPER ${CMAKE_BUILD_TYPE} UPPERCASE_CMAKE_BUILD_TYPE) |