diff options
| author | Alex Merry <kde@randomguy3.me.uk> | 2014-01-29 16:28:09 +0000 |
|---|---|---|
| committer | Alex Merry <kde@randomguy3.me.uk> | 2014-02-04 22:55:12 +0000 |
| commit | 8feefd08de064de173fbfcef64a922087f9861fc (patch) | |
| tree | 97d7f4c98484092f2af106971d38f217d2c2bb7d | |
| parent | b362f09095e7a5371d1a88378b0a847c92ba0057 (diff) | |
| download | extra-cmake-modules-8feefd08de064de173fbfcef64a922087f9861fc.tar.gz extra-cmake-modules-8feefd08de064de173fbfcef64a922087f9861fc.tar.bz2 | |
Use the MSVC variable directly, instead of the compiler ID
This is cleaner and easier to read.
REVIEW: 115378
| -rw-r--r-- | kde-modules/KDECompilerSettings.cmake | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/kde-modules/KDECompilerSettings.cmake b/kde-modules/KDECompilerSettings.cmake index 9a3f4de5..dfb85d77 100644 --- a/kde-modules/KDECompilerSettings.cmake +++ b/kde-modules/KDECompilerSettings.cmake @@ -198,8 +198,7 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") # it. elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" AND NOT WIN32) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions") -#elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC" OR -# (WIN32 AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")) +#elseif (MSVC OR (WIN32 AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")) # Exceptions appear to be disabled by default for MSVC # http://msdn.microsoft.com/en-us/library/1deeycx5.aspx @@ -207,7 +206,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" AND NOT WIN32) endif() macro(_kdecompilersettings_append_exception_flag VAR) - if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") + if (MSVC) set(${VAR} "${${VAR}} -EHsc") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel") if (WIN32) @@ -309,7 +308,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" AND NOT WIN32) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -w1 -Wpointer-arith") endif() -if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") +if (MSVC) # FIXME: do we not want to set the warning level up to level 3? (/W3) # Disable warnings: # C4250: 'class1' : inherits 'class2::member' via dominance @@ -354,8 +353,7 @@ if (APPLE) endif() if (WIN32) - if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC" OR - (WIN32 AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")) + if (MSVC OR (WIN32 AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")) # make sure that no header adds libcmt by default using # #pragma comment(lib, "libcmt.lib") as done by mfc/afx.h set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/NODEFAULTLIB:libcmt /DEFAULTLIB:msvcrt ${CMAKE_EXE_LINKER_FLAGS_RELEASE}") |