diff -r 6e4ca1c46370 -r 6e09555b25b4 CMakeLists.txt --- a/CMakeLists.txt Wed Oct 09 15:30:29 2019 +0200 +++ b/CMakeLists.txt Wed Oct 09 16:35:06 2019 +0200 @@ -54,7 +54,7 @@ if(BUILD_ENGINE_C AND NOT NOVIDEOREC) - if((CMAKE_BUILD_TYPE MATCHES "RELEASE") OR (CMAKE_BUILD_TYPE MATCHES "RELWITHDEBUGINFO")) + if((CMAKE_BUILD_TYPE MATCHES "Release") OR (CMAKE_BUILD_TYPE MATCHES "RelWithDebInfo")) message("NOTE: Video recorder support disabled. It's incompatible with BUILD_ENGINE_C") set(BUILD_ENGINE_C ON CACHE STRING "Required for BUILD_ENGINE_JS" FORCE) else() @@ -93,7 +93,7 @@ set(CPACK_PACKAGE_VERSION_MINOR 0) set(CPACK_PACKAGE_VERSION_PATCH 0) set(HEDGEWARS_PROTO_VER 59) -if((CMAKE_BUILD_TYPE MATCHES "RELEASE") OR (CMAKE_BUILD_TYPE MATCHES "RELWITHDEBUGINFO")) +if((CMAKE_BUILD_TYPE MATCHES "Release") OR (CMAKE_BUILD_TYPE MATCHES "RelWithDebInfo")) set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") else() set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-dev") @@ -113,9 +113,9 @@ #when build type is not specified, assume Debug/Release according to build version information if(CMAKE_BUILD_TYPE) string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE) - if(NOT((CMAKE_BUILD_TYPE MATCHES "RELEASE") OR - (CMAKE_BUILD_TYPE MATCHES "DEBUG") OR - (CMAKE_BUILD_TYPE MATCHES "RELWITHDEBINFO"))) + if(NOT((CMAKE_BUILD_TYPE MATCHES "Release") OR + (CMAKE_BUILD_TYPE MATCHES "Debug") OR + (CMAKE_BUILD_TYPE MATCHES "RelWithDebInfo"))) set(CMAKE_BUILD_TYPE ${default_build_type} CACHE STRING "Build type (Debug/Release/RelWithDebInfo)" FORCE) message(STATUS "Unknown build type ${CMAKE_BUILD_TYPE}, using default (${default_build_type})") endif() @@ -168,7 +168,7 @@ #get BUILD_TYPE and enable/disable optimisation message(STATUS "Using ${CMAKE_BUILD_TYPE} configuration") -if(CMAKE_BUILD_TYPE MATCHES "DEBUG") +if(CMAKE_BUILD_TYPE MATCHES "Debug") list(APPEND haskell_flags "-Wall" # all warnings "-debug" # debug mode "-fno-warn-unused-do-bind"