Merge branch 'development' into MiscImprovements

2019-04-28 06:59:27 +02:00 · 2019-04-28 06:59:27 +02:00 · a5ff0edf1f
parent 7041c1508a 7b04b76112
commit a5ff0edf1f
1 changed files with 2 additions and 2 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -138,14 +138,14 @@ elseif (CMAKE_BUILD_TYPE STREQUAL "PERFORMANCE")
 endif ()

 # $OPTIMIZATION takes precedence over $BUILD_TYPE defaults
-if (OPTIMIZATION STREQUAL "")
+if (OPTIMIZATION STREQUAL "" OR NOT DEFINED OPTIMIZATION)
    set (OPTIMIZATION "${OPTI}")
 else ()
    set (OPTIMIZATION "${OPTIMIZATION}")
 endif ()

 # $OPENMP takes precedence over $BUILD_TYPE defaults
-if (OPENMP STREQUAL "")
+if (OPENMP STREQUAL "" OR NOT DEFINED OPENMP)
    set (OPENMP "${PARALLEL}")
 else ()
    set(OPENMP "${OPENMP}")