Changeset: d11b96b4386d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d11b96b4386d
Modified Files:
cmake/monetdb-toolchain.cmake
Branch: Oct2020
Log Message:
Remove duplicate options; reinstate compiler options.
diffs (28 lines):
diff --git a/cmake/monetdb-toolchain.cmake b/cmake/monetdb-toolchain.cmake
--- a/cmake/monetdb-toolchain.cmake
+++ b/cmake/monetdb-toolchain.cmake
@@ -46,7 +46,6 @@ function(monetdb_default_toolchain)
MT_checkCompilerFlag("-Wvariadic-macros")
MT_checkCompilerFlag("-Wstack-protector")
MT_checkCompilerFlag("-fstack-protector-all")
- MT_checkCompilerFlag("-Wstack-protector")
MT_checkCompilerFlag("-Wpacked-bitfield-compat")
MT_checkCompilerFlag("-Wsync-nand")
MT_checkCompilerFlag("-Wjump-misses-init")
@@ -139,7 +138,6 @@ function(monetdb_default_compiler_option
add_option_if_available("-Wvariadic-macros")
add_option_if_available("-Wstack-protector")
add_option_if_available("-fstack-protector-all")
- add_option_if_available("-Wstack-protector")
add_option_if_available("-Wpacked-bitfield-compat")
add_option_if_available("-Wsync-nand")
add_option_if_available("-Wjump-misses-init")
@@ -157,6 +155,8 @@ function(monetdb_default_compiler_option
elseif(${CMAKE_C_COMPILER_ID} STREQUAL "Intel")
if(WIN32)
add_compile_options("/W3")
+ add_compile_options("/Qdiag-disable:11074")
+ add_compile_options("/Qdiag-disable:11075")
add_compile_options("/Wcheck")
add_compile_options("/Werror-all")
add_compile_options("/${INTEL_OPTION_EXTRA}wd2259")
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
