This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository megaglest.
commit 048b75675e939e4676509899210c912d8e65bf80 Author: Markus Koschany <[email protected]> Date: Sat Jan 31 15:42:42 2015 +0100 Drop fix-cmake-build-type-none.patch. Merged upstream. --- debian/patches/fix-cmake-build-type-none.patch | 65 -------------------------- debian/patches/series | 1 - 2 files changed, 66 deletions(-) diff --git a/debian/patches/fix-cmake-build-type-none.patch b/debian/patches/fix-cmake-build-type-none.patch deleted file mode 100644 index 9c4dc9c..0000000 --- a/debian/patches/fix-cmake-build-type-none.patch +++ /dev/null @@ -1,65 +0,0 @@ -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 -Forwarded: https://github.com/MegaGlest/megaglest-source/pull/9 - ---- - 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 - diff --git a/debian/patches/series b/debian/patches/series index 9c34306..922fef6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -fix-cmake-build-type-none.patch wxWidgets-assertions.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/megaglest.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
