Changeset: 45a4d4443e34 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=45a4d4443e34
Modified Files:
CMakeLists.txt
sql/server/CMakeLists.txt
Branch: cmake-fun
Log Message:
Intel compiler fixes.
diffs (75 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -154,7 +154,6 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux"
set(CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}
-D_GNU_SOURCE -D_XOPEN_SOURCE") # required for tests
endif()
if(${CMAKE_C_COMPILER_ID} STREQUAL "Intel")
- add_compile_options(-no-gcc) # Intel compiler hack
if(EXISTS "${ROOT}/usr/include/math.h") # see
https://software.intel.com/en-us/forums/intel-c-compiler/topic/760979
file(READ "${ROOT}/usr/include/math.h" TMPTXT)
string(FIND "${TMPTXT}" "_LIB_VERSION_TYPE" FOUND_VERSION)
@@ -594,10 +593,12 @@ if(MSVC)
MT_addCompilerFlag("/MD" "/MD" "${CMAKE_C_FLAGS_MINSIZEREL}"
"MinSizeRel" CMAKE_C_FLAGS_MINSIZEREL)
elseif(${CMAKE_C_COMPILER_ID} STREQUAL "Intel")
MT_removeCompilerFlag("${COMPILER_OPTION}O[0-9]+[ ]?"
"${COMPILER_OPTION}Ox" "${CMAKE_C_FLAGS_DEBUG}" "Debug" CMAKE_C_FLAGS_DEBUG)
- MT_removeCompilerFlag("${COMPILER_OPTION}O[013-9]+[ ]?"
"${COMPILER_OPTION}Ox" "${CMAKE_C_FLAGS_RELEASE}" "Release"
CMAKE_C_FLAGS_RELEASE)
- MT_removeCompilerFlag("${COMPILER_OPTION}O[013-9]+[ ]?"
"${COMPILER_OPTION}Ox" "${CMAKE_C_FLAGS_RELWITHDEBINFO}" "RelWithDebugInfo"
CMAKE_C_FLAGS_RELWITHDEBINFO)
+ 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)
- MT_addCompilerFlag("${COMPILER_OPTION}Od" "${COMPILER_OPTION}Od"
"${CMAKE_C_FLAGS_DEBUG}" "Debug" CMAKE_C_FLAGS_DEBUG)
+ 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)
@@ -650,7 +651,7 @@ endif()
function(MT_checkCompilerFlag Flag) # WARNING this doesn't work with
LINK_OPTIONS yet!
if(NOT "${CMAKE_C_FLAGS}" MATCHES "${Flag}")
- string(REGEX REPLACE "[-/=]" "" FLAG_TEST "${Flag}") # cmake
will get confused if we don't remove - / =
+ string(REGEX REPLACE "[-/=,]" "" FLAG_TEST "${Flag}") # cmake
will get confused if we don't remove - / = ,
cmake_push_check_state()
set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${Flag}")
check_c_source_compiles("int main(int argc,char**
argv){(void)argc;(void)argv;return 0;}" COMPILER_${FLAG_TEST})
@@ -700,16 +701,16 @@ if(${ENABLE_STRICT} STREQUAL "YES")
MT_checkCompilerFlag("-Wnested-externs")
MT_checkCompilerFlag("-Wno-char-subscripts")
MT_checkCompilerFlag("-Wunreachable-code")
- elseif(${CMAKE_C_COMPILER_ID} STREQUAL "Intel" AND ${CMAKE_SYSTEM_NAME}
STREQUAL "Linux")
- MT_addCompilerFlag("-shared-intel" "-shared-intel"
"${LINK_OPTIONS}" "all" LINK_OPTIONS)
- MT_checkCompilerFlag("-ansi")
- MT_checkCompilerFlag("-Wall")
- MT_checkCompilerFlag("-w2")
- MT_checkCompilerFlag("-Wcheck")
- MT_checkCompilerFlag("-Werror")
- MT_checkCompilerFlag("-Werror-all")
- MT_checkCompilerFlag("-we140,147,181,266,271,593,810")
- MT_checkCompilerFlag("-wd193,279,981,1357,1418,1419,2259")
+ elseif(${CMAKE_C_COMPILER_ID} STREQUAL "Intel")
+ if(NOT WIN32)
+ MT_checkCompilerFlag("${COMPILER_OPTION}shared-intel")
+ endif()
+ MT_checkCompilerFlag("${COMPILER_OPTION}Wall")
+ MT_checkCompilerFlag("${COMPILER_OPTION}Wcheck")
+ MT_checkCompilerFlag("${COMPILER_OPTION}Werror-all")
+ # WINDOWS set(INTEL_CHECK_EXTRA "Q")
+
#MT_checkCompilerFlag("${COMPILER_OPTION}${INTEL_CHECK_EXTRA}we140,147,181,266,271,593,810")
+
#MT_checkCompilerFlag("${COMPILER_OPTION}${INTEL_CHECK_EXTRA}wd193,279,981,1357,1418,1419,2259")
elseif(MSVC)
MT_checkCompilerFlag("/WX")
endif()
diff --git a/sql/server/CMakeLists.txt b/sql/server/CMakeLists.txt
--- a/sql/server/CMakeLists.txt
+++ b/sql/server/CMakeLists.txt
@@ -62,7 +62,6 @@ add_library(sqlserver STATIC
rel_updates.h rel_psm.h rel_xml.h sql_atom.h
sql_datetime.h
sql_decimal.h sql_env.h sql_mvc.h sql_parser.h
sql_privileges.h sql_query.h sql_qc.h sql_scan.h
- sql_semantic.h sql_symbol.h sql_tokens.h
sql_partition.h)
-target_link_libraries(sqlserver PRIVATE bison_obj)
+ sql_semantic.h sql_symbol.h sql_tokens.h
sql_partition.h $<TARGET_OBJECTS:bison_obj>)
set_target_properties(sqlserver PROPERTIES POSITION_INDEPENDENT_CODE ON)
target_compile_definitions(sqlserver PRIVATE LIBSQL LIBSQLSERVER LIBSQLCOMMON
LIBBATSTORE LIBSTORE)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
