Changeset: 8613a9f140de for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8613a9f140de
Modified Files:
CMakeLists.txt
monetdb_config.h.in
Branch: cmake-fun
Log Message:
Finally compiles.
diffs (26 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -163,7 +163,6 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux"
endif()
if(${CMAKE_C_COMPILER_ID} STREQUAL "Intel")
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
- MT_addCompilerFlag("-no-gcc([ ]|$)" "-no-gcc"
"${CMAKE_C_FLAGS}" "all" CMAKE_C_FLAGS)
MT_addCompilerFlag("-no-gcc-include-dir" "-no-gcc-include-dir"
"${CMAKE_C_FLAGS}" "all" CMAKE_C_FLAGS)
endif()
if(EXISTS "${ROOT}/usr/include/math.h") # see
https://software.intel.com/en-us/forums/intel-c-compiler/topic/760979
diff --git a/monetdb_config.h.in b/monetdb_config.h.in
--- a/monetdb_config.h.in
+++ b/monetdb_config.h.in
@@ -442,10 +442,8 @@
#endif
/* Intel compiler doesn't support _Pragma from GCC well */
-#ifdef _INTEL_COMPILER
-#ifdef _Pragma
+#if defined(__GNUC__) && defined(__INTEL_COMPILER)
#undef _Pragma
-#endif
#define _Pragma(a)
#endif
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
