Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
authorsheepluva
Sat, 17 Jan 2015 14:26:25 +0100
changeset 10790 7e8ea160152f
parent 10788 418058ce8ffe (diff)
parent 10789 acbf69e2e5cf (current diff)
child 10791 0311c9fa7498
merge
--- a/CMakeLists.txt	Fri Jan 16 17:51:29 2015 -0500
+++ b/CMakeLists.txt	Sat Jan 17 14:26:25 2015 +0100
@@ -70,12 +70,13 @@
 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")))
-        set(CMAKE_BUILD_TYPE ${default_build_type} CACHE STRING "Build type (Debug/Release)" FORCE)
-        message(STATUS "Unknown build type, using default (${default_build_type})")
+           (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()
 else(CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE ${default_build_type} CACHE STRING "Build type (Debug/Release)" FORCE)
+    set(CMAKE_BUILD_TYPE ${default_build_type} CACHE STRING "Build type (Debug/Release/RelWithDebInfo)" FORCE)
 endif(CMAKE_BUILD_TYPE)
 
 
--- a/QTfrontend/CMakeLists.txt	Fri Jan 16 17:51:29 2015 -0500
+++ b/QTfrontend/CMakeLists.txt	Sat Jan 17 14:26:25 2015 +0100
@@ -190,9 +190,9 @@
 
 #when debugging, always prompt a console to see fronted messages
 #TODO: check it doesn't interfere on UNIX
-if(CMAKE_BUILD_TYPE MATCHES "RELEASE")
+if(CMAKE_BUILD_TYPE MATCHES "RELEASE" OR CMAKE_BUILD_TYPE MATCHES "RELWITHDEBINFO")
     set(console_access "WIN32")
-endif(CMAKE_BUILD_TYPE MATCHES "RELEASE")
+endif(CMAKE_BUILD_TYPE MATCHES "RELEASE" OR CMAKE_BUILD_TYPE MATCHES "RELWITHDEBINFO")
 
 add_executable(hedgewars ${console_access}
     ${hwfr_src}
--- a/cmake_modules/compilerchecks.cmake	Fri Jan 16 17:51:29 2015 -0500
+++ b/cmake_modules/compilerchecks.cmake	Sat Jan 17 14:26:25 2015 +0100
@@ -62,7 +62,7 @@
         endif()
     endif()
 
-    if(CMAKE_BUILD_TYPE MATCHES "RELEASE")
+    if(CMAKE_BUILD_TYPE MATCHES "RELEASE" OR CMAKE_BUILD_TYPE MATCHES "RELWITHDEBINFO")
         set(CMAKE_REQUIRED_FLAGS "-Wl,--as-needed")
         check_c_compiler_flag("" HAVE_ASNEEDED)
         if(HAVE_ASNEEDED)
hedgewars