[patch] Patch to performous v0.5.1: {,game/}CMakeList.txt

performous-0.5.1-modules.patch (text/plain), 1.78 KB, created by Jyrki Launonen on 2010-09-21 13:07:20 UTC

--- org/CMakeLists.txt	2010-09-21 15:32:03.000000000 +0300
+++ new/CMakeLists.txt	2010-09-21 15:34:22.000000000 +0300
@@ -11,6 +11,7 @@
 include(cmake/performous-packaging.cmake)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "/usr/share/cmake/Modules/")
 
 # Add a sensible build type default and warning because empty means no optimization and no debug info.
 if(NOT CMAKE_BUILD_TYPE)
@@ -34,7 +35,7 @@
 
 #need to put here do setting LOCALE_DIR variable
 find_package(Gettext)
-if(Gettext_FOUND)
+if(GETTEXT_FOUND)
 	if(NOT LOCALE_DIR)
 		if(WIN32)
 			SET(LOCALE_DIR "locale")
@@ -57,7 +58,7 @@
 			message(STATUS "Cannot find msgfmt to convert language file. Translation won't be enabled")
 		endif()
 	endif(NOT LOCALE_DIR)
-endif(Gettext_FOUND)
+endif(GETTEXT_FOUND)
 add_subdirectory(libs)
 add_subdirectory(themes)
 add_subdirectory(data)
--- org/game/CMakeLists.txt	2010-09-21 15:32:10.000000000 +0300
+++ new/game/CMakeLists.txt	2010-09-21 15:34:22.000000000 +0300
@@ -79,7 +79,7 @@
 endif()
 
 # Find all the libs that don't require extra parameters
-foreach(lib ${OUR_LIBS} SDL PangoCairo LibRSVG LibXML++ GLEW AVFormat SWScale OpenGL Z Jpeg Png)
+foreach(lib ${OUR_LIBS} SDL PangoCairo LibRSVG LibXML++ GLEW AVFormat SWScale OpenGL ZLIB JPEG PNG)
 	find_package(${lib} REQUIRED)
 	include_directories(${${lib}_INCLUDE_DIRS})
 	list(APPEND LIBS ${${lib}_LIBRARIES})
@@ -87,9 +87,9 @@
 endforeach(lib)
 
 find_package(Gettext)
-if(Gettext_FOUND)
-	include_directories(${Gettext_INCLUDE_DIRS})
-	list(APPEND LIBS ${Gettext_LIBRARIES})
+if(GETTEXT_FOUND)
+	include_directories(${GETTEXT_INCLUDE_DIRS})
+	list(APPEND LIBS ${GETTEXT_LIBRARIES})
 	add_definitions("-DUSE_GETTEXT")
 	message(STATUS "Internationalization: Enabled")
 else()