Attachment #248265 for bug #245452

View | Details | Raw Unified | Return to bug 245452
Collapse All | Expand All




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)


#need to put here do setting LOCALE_DIR variable
find_package(Gettext)
if(GETTEXT_FOUND)
	if(NOT LOCALE_DIR)
		if(WIN32)
			SET(LOCALE_DIR "locale")

			message(STATUS "Cannot find msgfmt to convert language file. Translation won't be enabled")
		endif()
	endif(NOT LOCALE_DIR)
endif(GETTEXT_FOUND)
add_subdirectory(libs)
add_subdirectory(themes)
add_subdirectory(data)




endif()

# Find all the libs that don't require extra parameters
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})

endforeach(lib)

find_package(Gettext)
if(GETTEXT_FOUND)
	include_directories(${GETTEXT_INCLUDE_DIRS})
	list(APPEND LIBS ${GETTEXT_LIBRARIES})
	add_definitions("-DUSE_GETTEXT")
	message(STATUS "Internationalization: Enabled")
else()

Return to bug 245452

Lines 11-16 Link Here

(-)org/CMakeLists.txt (-2 / +3 lines)
11	include(cmake/performous-packaging.cmake)	11	include(cmake/performous-packaging.cmake)
12		12
13	set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")	13	set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
		14	set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "/usr/share/cmake/Modules/")
14		15
15	# Add a sensible build type default and warning because empty means no optimization and no debug info.	16	# Add a sensible build type default and warning because empty means no optimization and no debug info.
16	if(NOT CMAKE_BUILD_TYPE)	17	if(NOT CMAKE_BUILD_TYPE)
Lines 34-40 Link Here
34		35
35	#need to put here do setting LOCALE_DIR variable	36	#need to put here do setting LOCALE_DIR variable
36	find_package(Gettext)	37	find_package(Gettext)
37	if(Gettext_FOUND)	38	if(GETTEXT_FOUND)
38	if(NOT LOCALE_DIR)	39	if(NOT LOCALE_DIR)
39	if(WIN32)	40	if(WIN32)
40	SET(LOCALE_DIR "locale")	41	SET(LOCALE_DIR "locale")
Lines 57-63 Link Here
57	message(STATUS "Cannot find msgfmt to convert language file. Translation won't be enabled")	58	message(STATUS "Cannot find msgfmt to convert language file. Translation won't be enabled")
58	endif()	59	endif()
59	endif(NOT LOCALE_DIR)	60	endif(NOT LOCALE_DIR)
60	endif(Gettext_FOUND)	61	endif(GETTEXT_FOUND)
61	add_subdirectory(libs)	62	add_subdirectory(libs)
62	add_subdirectory(themes)	63	add_subdirectory(themes)
63	add_subdirectory(data)	64	add_subdirectory(data)

Lines 79-85 Link Here

(-)org/game/CMakeLists.txt (-4 / +4 lines)
79	endif()	79	endif()
80		80
81	# Find all the libs that don't require extra parameters	81	# Find all the libs that don't require extra parameters
82	foreach(lib ${OUR_LIBS} SDL PangoCairo LibRSVG LibXML++ GLEW AVFormat SWScale OpenGL Z Jpeg Png)	82	foreach(lib ${OUR_LIBS} SDL PangoCairo LibRSVG LibXML++ GLEW AVFormat SWScale OpenGL ZLIB JPEG PNG)
83	find_package(${lib} REQUIRED)	83	find_package(${lib} REQUIRED)
84	include_directories(${${lib}_INCLUDE_DIRS})	84	include_directories(${${lib}_INCLUDE_DIRS})
85	list(APPEND LIBS ${${lib}_LIBRARIES})	85	list(APPEND LIBS ${${lib}_LIBRARIES})
Lines 87-95 Link Here
87	endforeach(lib)	87	endforeach(lib)
88		88
89	find_package(Gettext)	89	find_package(Gettext)
90	if(Gettext_FOUND)	90	if(GETTEXT_FOUND)
91	include_directories(${Gettext_INCLUDE_DIRS})	91	include_directories(${GETTEXT_INCLUDE_DIRS})
92	list(APPEND LIBS ${Gettext_LIBRARIES})	92	list(APPEND LIBS ${GETTEXT_LIBRARIES})
93	add_definitions("-DUSE_GETTEXT")	93	add_definitions("-DUSE_GETTEXT")
94	message(STATUS "Internationalization: Enabled")	94	message(STATUS "Internationalization: Enabled")
95	else()	95	else()