31 lines
1.8 KiB
Diff
31 lines
1.8 KiB
Diff
Index: CMakeLists.txt
|
|
===================================================================
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -54,7 +54,7 @@ option(NOVERSIONINFOUPDATE "Disable upda
|
|
|
|
|
|
if(BUILD_ENGINE_C AND NOT NOVIDEOREC)
|
|
- if((CMAKE_BUILD_TYPE STREQUAL "Release") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
|
|
+ if((CMAKE_BUILD_TYPE STREQUAL "Release") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") OR (CMAKE_BUILD_TYPE STREQUAL "None"))
|
|
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_MAJOR 1)
|
|
set(CPACK_PACKAGE_VERSION_MINOR 0)
|
|
set(CPACK_PACKAGE_VERSION_PATCH 0)
|
|
set(HEDGEWARS_PROTO_VER 59)
|
|
-if((CMAKE_BUILD_TYPE STREQUAL "Release") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
|
|
+if((CMAKE_BUILD_TYPE STREQUAL "Release") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") OR (CMAKE_BUILD_TYPE STREQUAL "None"))
|
|
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")
|
|
@@ -114,6 +114,7 @@ include(${CMAKE_MODULE_PATH}/platform.cm
|
|
if(CMAKE_BUILD_TYPE)
|
|
if(NOT((CMAKE_BUILD_TYPE STREQUAL "Release") OR
|
|
(CMAKE_BUILD_TYPE STREQUAL "Debug") OR
|
|
+ (CMAKE_BUILD_TYPE STREQUAL "None") OR
|
|
(CMAKE_BUILD_TYPE STREQUAL "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})")
|