Changeset: 1b6693904420 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1b6693904420
Modified Files:
CMakeLists.txt
Branch: cmake-fun
Log Message:
Fixed flags for Intel compiler on Windows.
diffs (33 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -594,12 +594,16 @@ elseif(${CMAKE_C_COMPILER_ID} STREQUAL "
MT_removeCompilerFlag("${COMPILER_OPTION}O[0-24-9]+[ ]?"
"${COMPILER_OPTION}Ox" "${CMAKE_C_FLAGS_RELEASE}" "Release"
CMAKE_C_FLAGS_RELEASE)
MT_removeCompilerFlag("${COMPILER_OPTION}O[0-24-9]+[ ]?"
"${COMPILER_OPTION}Ox" "${CMAKE_C_FLAGS_RELWITHDEBINFO}" "RelWithDebugInfo"
CMAKE_C_FLAGS_RELWITHDEBINFO)
MT_removeCompilerFlag("${COMPILER_OPTION}O[02-9]+[ ]?"
"${COMPILER_OPTION}Ox" "${CMAKE_C_FLAGS_MINSIZEREL}" "MinSizeRel"
CMAKE_C_FLAGS_MINSIZEREL)
- if(WIN32)
- MT_addCompilerFlag("${COMPILER_OPTION}Od"
"${COMPILER_OPTION}Od" "${CMAKE_C_FLAGS_DEBUG}" "Debug" CMAKE_C_FLAGS_DEBUG)
- endif()
MT_addCompilerFlag("${COMPILER_OPTION}O3" "${COMPILER_OPTION}O3"
"${CMAKE_C_FLAGS_RELEASE}" "Release" CMAKE_C_FLAGS_RELEASE)
MT_addCompilerFlag("${COMPILER_OPTION}O3" "${COMPILER_OPTION}O3"
"${CMAKE_C_FLAGS_RELWITHDEBINFO}" "RelWithDebugInfo"
CMAKE_C_FLAGS_RELWITHDEBINFO)
MT_addCompilerFlag("${COMPILER_OPTION}O1" "${COMPILER_OPTION}O1"
"${CMAKE_C_FLAGS_MINSIZEREL}" "MinSizeRel" CMAKE_C_FLAGS_MINSIZEREL)
+ if(WIN32)
+ MT_addCompilerFlag("${COMPILER_OPTION}Od"
"${COMPILER_OPTION}Od" "${CMAKE_C_FLAGS_DEBUG}" "Debug" CMAKE_C_FLAGS_DEBUG)
+ MT_addCompilerFlag("/GR-" "/GR-" "${CMAKE_C_FLAGS}" "all"
CMAKE_C_FLAGS)
+ MT_addCompilerFlag("/Qsafeseh-" "/Qsafeseh-" "${CMAKE_C_FLAGS}"
"all" CMAKE_C_FLAGS)
+ else()
+ MT_addCompilerFlag("-shared-intel" "-shared-intel"
"${CMAKE_C_FLAGS}" "all" CMAKE_C_FLAGS)
+ endif()
if(CMAKE_VERSION VERSION_LESS 3.1)
MT_addCompilerFlag("${COMPILER_OPTION}${INTEL_OPTION_EXTRA}std=c99"
"${COMPILER_OPTION}${INTEL_OPTION_EXTRA}std=c99" "${CMAKE_C_FLAGS}" "all"
CMAKE_C_FLAGS)
endif()
@@ -693,9 +697,6 @@ if(${ENABLE_STRICT} STREQUAL "YES")
MT_checkCompilerFlag("-Wnested-externs")
MT_checkCompilerFlag("-Wunreachable-code")
elseif(${CMAKE_C_COMPILER_ID} STREQUAL "Intel")
- if(NOT WIN32)
- MT_addCompilerFlag("${COMPILER_OPTION}shared-intel"
"${COMPILER_OPTION}shared-intel" "${CMAKE_C_FLAGS}" "all" CMAKE_C_FLAGS)
- endif()
MT_addCompilerFlag("${COMPILER_OPTION}Wall"
"${COMPILER_OPTION}Wall" "${CMAKE_C_FLAGS}" "all" CMAKE_C_FLAGS)
MT_addCompilerFlag("${COMPILER_OPTION}Wcheck"
"${COMPILER_OPTION}Wcheck" "${CMAKE_C_FLAGS}" "all" CMAKE_C_FLAGS)
MT_addCompilerFlag("${COMPILER_OPTION}Werror-all"
"${COMPILER_OPTION}Werror-all" "${CMAKE_C_FLAGS}" "all" CMAKE_C_FLAGS)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
