# HG changeset patch # User sheepluva # Date 1421419654 -3600 # Node ID 418058ce8ffe1bbf47d63f21579a2975d58b3c7c # Parent 50a4cdeedb44cdb30998f0a64a92b8cc45005ae4# Parent 8e742c9ffdf868c215be69e7c53334e333d7f80d Merge pull request #31 from LocutusOfBorg/fix-cmake Add RelWithDebInfo for debugging pourposes diff -r 50a4cdeedb44 -r 418058ce8ffe CMakeLists.txt --- a/CMakeLists.txt Wed Jan 14 11:47:50 2015 +0300 +++ b/CMakeLists.txt Fri Jan 16 15:47:34 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) diff -r 50a4cdeedb44 -r 418058ce8ffe QTfrontend/CMakeLists.txt --- a/QTfrontend/CMakeLists.txt Wed Jan 14 11:47:50 2015 +0300 +++ b/QTfrontend/CMakeLists.txt Fri Jan 16 15:47:34 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} diff -r 50a4cdeedb44 -r 418058ce8ffe cmake_modules/compilerchecks.cmake --- a/cmake_modules/compilerchecks.cmake Wed Jan 14 11:47:50 2015 +0300 +++ b/cmake_modules/compilerchecks.cmake Fri Jan 16 15:47:34 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)