diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-12-21 06:32:51 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-12-21 06:32:51 +0300 |
| commit | 0d9ead00f85fa399956bc7fa4b76f8adf7f5b40a (patch) | |
| tree | 7ce173239f7e551acd9c57703f64d896b4c333db /CMakeLists.txt | |
| parent | a8febab31bb82d393a12a29ef9ad35c8a13c234e (diff) | |
fix for cmake flag detection, was not caching the resulting variable so the test ran each time.
also cache SSE, SSE2 checks.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 47 |
1 files changed, 25 insertions, 22 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 89ee0707280..cc6715f8237 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -962,6 +962,9 @@ if(WITH_OPENMP) else() set(WITH_OPENMP OFF) endif() + + mark_as_advanced(OpenMP_C_FLAGS) + mark_as_advanced(OpenMP_CXX_FLAGS) endif() #----------------------------------------------------------------------------- @@ -984,32 +987,32 @@ endif() if(CMAKE_COMPILER_IS_GNUCC) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS -Wall) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS -Wcast-align) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS -Wdeclaration-after-statement) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS -Werror=declaration-after-statement) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS -Werror=implicit-function-declaration) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS -Werror=return-type) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS -Werror=strict-prototypes) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS -Wno-char-subscripts) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS -Wno-unknown-pragmas) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS -Wpointer-arith) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS -Wunused-parameter) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS -Wwrite-strings) - - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS -Wall) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS -Wno-invalid-offsetof) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS -Wno-sign-compare) + ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall) + ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_CAST_ALIGN -Wcast-align) + ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_DECLARATION_AFTER_STATEMENT -Wdeclaration-after-statement) + ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_DECLARATION_AFTER_STATEMENT -Werror=declaration-after-statement) + ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_IMPLICIT_FUNCTION_DECLARATION -Werror=implicit-function-declaration) + ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_RETURN_TYPE -Werror=return-type) + ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_STRICT_PROTOTYPES -Werror=strict-prototypes) + ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_CHAR_SUBSCRIPTS -Wno-char-subscripts) + ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_UNKNOWN_PRAGMAS -Wno-unknown-pragmas) + ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_POINTER_ARITH -Wpointer-arith) + ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNUSED_PARAMETER -Wunused-parameter) + ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_WRITE_STRINGS -Wwrite-strings) + + ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_ALL -Wall) + ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_INVALID_OFFSETOF -Wno-invalid-offsetof) + ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_SIGN_COMPARE -Wno-sign-compare) elseif(CMAKE_C_COMPILER_ID MATCHES "Intel") - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS -Wall) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS -Wpointer-arith) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS -Wno-unknown-pragmas) + ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall) + ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_POINTER_ARITH -Wpointer-arith) + ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_UNKNOWN_PRAGMAS -Wno-unknown-pragmas) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS -Wall) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS -Wno-invalid-offsetof) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS -Wno-sign-compare) + ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_ALL -Wall) + ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_INVALID_OFFSETOF -Wno-invalid-offsetof) + ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_SIGN_COMPARE -Wno-sign-compare) endif() |