diff options
| author | David Faure <faure@kde.org> | 2013-06-20 13:43:54 +0200 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2013-06-20 13:46:24 +0200 |
| commit | b39487f7d5b43b2933fc2a239b0bdb073f861608 (patch) | |
| tree | 20947fb5bb334192f5aa820c51eb32739ebefad8 | |
| parent | 7ca35d1e1cbfd5e34c2209f86251bce12af9877d (diff) | |
| download | extra-cmake-modules-b39487f7d5b43b2933fc2a239b0bdb073f861608.tar.gz extra-cmake-modules-b39487f7d5b43b2933fc2a239b0bdb073f861608.tar.bz2 | |
Forwardport a95c696ef1520339c6 from kdelibs.
Author: Andrius da Costa Ribas <andriusmao@gmail.com>
Date: Sat Jun 15 09:51:41 2013 -0300
Patch CMake files for Intel compiler support on win32.
| -rw-r--r-- | kde-modules/KDECompilerSettings.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kde-modules/KDECompilerSettings.cmake b/kde-modules/KDECompilerSettings.cmake index 544fcd1c..8a5c336b 100644 --- a/kde-modules/KDECompilerSettings.cmake +++ b/kde-modules/KDECompilerSettings.cmake @@ -70,7 +70,7 @@ if (WIN32) # don't know if package name, version and notes are always available # windows, microsoft compiler - if(MSVC) + if(MSVC OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel") set( _KDE4_PLATFORM_DEFINITIONS -DKDE_FULL_TEMPLATE_EXPORT_INSTANTIATION -DWIN32_LEAN_AND_MEAN ) # C4250: 'class1' : inherits 'class2::member' via dominance @@ -174,7 +174,7 @@ if (CMAKE_BUILD_TYPE) set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "DebugFull" "Release" "RelWithDebInfo" "Profile" "Coverage") endif() -if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") +if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC" OR (WIN32 AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")) # this macro is for internal use only. macro(_KDE_INSERT_FLAG FLAG VAR DOC) @@ -193,7 +193,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") _kde_insert_flag("/NODEFAULTLIB:libcmt /DEFAULTLIB:msvcrt" CMAKE_EXE_LINKER_FLAGS_RELEASE "release") _kde_insert_flag("/NODEFAULTLIB:libcmt /DEFAULTLIB:msvcrt" CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "release minsize") _kde_insert_flag("/NODEFAULTLIB:libcmtd /DEFAULTLIB:msvcrtd" CMAKE_EXE_LINKER_FLAGS_DEBUG "debug") -endif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") +endif() # TODO: this is for BSD, this looks like something which should be done in CMake # # This macro is for internal use only |