diff options
Diffstat (limited to 'games/minetest/files/patch-src-CMakeLists.txt')
| -rw-r--r-- | games/minetest/files/patch-src-CMakeLists.txt | 64 |
1 files changed, 10 insertions, 54 deletions
diff --git a/games/minetest/files/patch-src-CMakeLists.txt b/games/minetest/files/patch-src-CMakeLists.txt index 33d09e634e67..b797e95e8538 100644 --- a/games/minetest/files/patch-src-CMakeLists.txt +++ b/games/minetest/files/patch-src-CMakeLists.txt @@ -1,54 +1,10 @@ ---- src/CMakeLists.txt.orig 2012-01-23 01:05:36.000000000 +0400 -+++ src/CMakeLists.txt 2012-01-26 23:39:18.625614369 +0400 -@@ -11,23 +11,25 @@ - # this is only set to 1 if gettext is enabled _and_ available - set(USE_GETTEXT 0) - --find_package(GettextLib) -+if(ENABLE_GETTEXT) -+ find_package(GettextLib) - --if(GETTEXT_FOUND AND ENABLE_GETTEXT) -- message(STATUS "gettext include path: ${GETTEXT_INCLUDE_DIR}") -- message(STATUS "gettext msgfmt path: ${GETTEXT_MSGFMT}") -- if(WIN32) -- message(STATUS "gettext library: ${GETTEXT_LIBRARY}") -- message(STATUS "gettext dll: ${GETTEXT_DLL}") -- message(STATUS "gettext iconv dll: ${GETTEXT_ICONV_DLL}") -- endif() -- set(USE_GETTEXT 1) -- message(STATUS "GetText enabled; locales found: ${GETTEXT_AVAILABLE_LOCALES}") --elseif(GETTEXT_FOUND AND NOT ENABLE_GETTEXT) -- MESSAGE(STATUS "GetText found but disabled;") --else(GETTEXT_FOUND AND ENABLE_GETTEXT) -+ if(GETTEXT_FOUND) -+ message(STATUS "gettext include path: ${GETTEXT_INCLUDE_DIR}") -+ message(STATUS "gettext msgfmt path: ${GETTEXT_MSGFMT}") -+ if(WIN32) -+ message(STATUS "gettext library: ${GETTEXT_LIBRARY}") -+ message(STATUS "gettext dll: ${GETTEXT_DLL}") -+ message(STATUS "gettext iconv dll: ${GETTEXT_ICONV_DLL}") -+ endif() -+ set(USE_GETTEXT 1) -+ message(STATUS "GetText enabled; locales found: ${GETTEXT_AVAILABLE_LOCALES}") -+ elseif(GETTEXT_FOUND) -+ MESSAGE(STATUS "GetText not found, disabling") -+ endif(GETTEXT_FOUND) -+else(ENABLE_GETTEXT) - message(STATUS "GetText disabled") --endif(GETTEXT_FOUND AND ENABLE_GETTEXT) -+endif(ENABLE_GETTEXT) - - if(NOT MSVC) - set(USE_GPROF 0 CACHE BOOL "Use -pg flag for g++") -@@ -280,8 +282,8 @@ - set(ARCH i386) - endif() - -- set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} -O3 -ffast-math -Wall -fomit-frame-pointer -pipe -funroll-loops") -- set(CMAKE_CXX_FLAGS_DEBUG "-g -O1 -Wall ${WARNING_FLAGS}") -+ set(CMAKE_CXX_FLAGS_RELEASE "${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} -Wall") -+ set(CMAKE_CXX_FLAGS_DEBUG "-Wall ${WARNING_FLAGS}") - - if(USE_GPROF) - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -pg") +--- src/CMakeLists.txt.orig 2013-01-30 04:11:11.427933414 +0400 ++++ src/CMakeLists.txt 2013-01-30 04:11:49.504933655 +0400 +@@ -316,6 +316,7 @@ + ${ZLIB_LIBRARIES} + ${JTHREAD_LIBRARY} + ${SQLITE3_LIBRARY} ++ ${GETTEXT_LIBRARY} + ${LUA_LIBRARY} + ${PLATFORM_LIBS} + ) |