Author: pabs Date: 2014-03-26 02:48:03 +0000 (Wed, 26 Mar 2014) New Revision: 14990
Added: packages/trunk/megaglest/debian/patches/ packages/trunk/megaglest/debian/patches/fix-cmake-build-type-none.patch packages/trunk/megaglest/debian/patches/series Modified: packages/trunk/megaglest/debian/changelog Log: Fix building with -DCMAKE_BUILD_TYPE=None (Closes: #739068) Modified: packages/trunk/megaglest/debian/changelog =================================================================== --- packages/trunk/megaglest/debian/changelog 2014-03-25 15:31:03 UTC (rev 14989) +++ packages/trunk/megaglest/debian/changelog 2014-03-26 02:48:03 UTC (rev 14990) @@ -8,6 +8,7 @@ [ Paul Wise ] * Bump Standards-Version, no changes needed + * Fix building with -DCMAKE_BUILD_TYPE=None (Closes: #739068) -- Mark Vejvoda <[email protected]> Wed, 15 Jan 2014 21:01:59 +0800 Added: packages/trunk/megaglest/debian/patches/fix-cmake-build-type-none.patch =================================================================== --- packages/trunk/megaglest/debian/patches/fix-cmake-build-type-none.patch (rev 0) +++ packages/trunk/megaglest/debian/patches/fix-cmake-build-type-none.patch 2014-03-26 02:48:03 UTC (rev 14990) @@ -0,0 +1,64 @@ +From dce61e29ba5f97bbe4c319cec7c6fd370c660971 Mon Sep 17 00:00:00 2001 +From: Paul Wise <[email protected]> +Date: Wed, 26 Mar 2014 10:26:53 +0800 +Subject: [PATCH] Also support -DCMAKE_BUILD_TYPE=None which is used by Debian + +--- + CMakeLists.txt | 9 ++++++++- + source/glest_game/CMakeLists.txt | 1 + + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 48e4bea..77b67e4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -188,6 +188,9 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW) + message(STATUS "**WARNING DID NOT Find GCC backtrace lib") + ENDIF() + ++ # Default compiler flags ++ SET(CMAKE_CXX_FLAGS_NONE "${CMAKE_CXX_FLAGS_NONE}") ++ + # Debug compiler flags + SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g3") + +@@ -280,6 +283,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW) + MESSAGE(STATUS "*NOTE: Custom Data Install Path is [${CUSTOM_DATA_INSTALL_PATH}]") + ENDIF() + ++ SET(CMAKE_CXX_FLAGS_NONE "${CMAKE_CXX_FLAGS_NONE} ${GIT_VERSION_CMD} ${CUSTOM_DATA_INSTALL_PATH_VALUE}") + SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${GIT_VERSION_CMD} ${CUSTOM_DATA_INSTALL_PATH_VALUE}") + SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${GIT_VERSION_CMD} ${CUSTOM_DATA_INSTALL_PATH_VALUE}") + SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${GIT_VERSION_CMD} ${CUSTOM_DATA_INSTALL_PATH_VALUE}") +@@ -287,12 +291,15 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW) + + # We do some funky character escaping to get the right stuff written out to + # the final Makefile so we get the GIT Global Revsion # ++ string(REPLACE "'" "\"" CMAKE_CXX_FLAGS_NONE "${CMAKE_CXX_FLAGS_NONE}") + string(REPLACE "'" "\"" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}") + string(REPLACE "'" "\"" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") + string(REPLACE "'" "\"" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") + string(REPLACE "'" "\"" CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL}") + +- IF( CMAKE_BUILD_TYPE STREQUAL Debug ) ++ IF( CMAKE_BUILD_TYPE STREQUAL None ) ++ message("CMAKE_CXX_FLAGS_NONE: ${CMAKE_CXX_FLAGS_NONE}") ++ ELSEIF( CMAKE_BUILD_TYPE STREQUAL Debug ) + message("CMAKE_CXX_FLAGS_DEBUG: ${CMAKE_CXX_FLAGS_DEBUG}") + ELSEIF( CMAKE_BUILD_TYPE STREQUAL Release ) + message("CMAKE_CXX_FLAGS_RELEASE: ${CMAKE_CXX_FLAGS_RELEASE}") +diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt +index 1c94df6..eabc866 100644 +--- a/source/glest_game/CMakeLists.txt ++++ b/source/glest_game/CMakeLists.txt +@@ -208,6 +208,7 @@ IF(BUILD_MEGAGLEST) + ENDIF() + + IF(WIN32) ++ SET(CMAKE_CXX_FLAGS_NONE "${CMAKE_CXX_FLAGS_NONE} -Wl,-subsystem,console -mconsole") + SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wl,-subsystem,console -mconsole") + SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wl,-subsystem,console -mconsole") + SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -Wl,-subsystem,console -mconsole") +-- +1.9.0 + Added: packages/trunk/megaglest/debian/patches/series =================================================================== --- packages/trunk/megaglest/debian/patches/series (rev 0) +++ packages/trunk/megaglest/debian/patches/series 2014-03-26 02:48:03 UTC (rev 14990) @@ -0,0 +1 @@ +fix-cmake-build-type-none.patch _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
