version 1.1, 2011/05/06 05:36:23 |
version 1.4, 2016/02/25 19:59:55 |
|
|
$OpenBSD$ |
$OpenBSD$ |
--- CMakeLists.txt.orig Tue Apr 12 22:07:19 2011 |
--- CMakeLists.txt.orig Mon Jan 4 23:15:21 2016 |
+++ CMakeLists.txt Tue Apr 12 22:09:57 2011 |
+++ CMakeLists.txt Thu Feb 25 22:52:52 2016 |
@@ -7,9 +7,11 @@ find_package(SDL_image REQUIRED)
|
@@ -13,14 +13,14 @@ add_definitions(-DBOOST_FILESYSTEM_VERSION=3) |
find_package(SDL_ttf REQUIRED)
|
|
find_package(SDL_mixer REQUIRED)
|
# Searching for libintl using bundled CMake script |
find_package(OpenGL REQUIRED)
|
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/lib/fcitx/cmake") |
+find_package(Gettext REQUIRED) |
-include(FindLibintl) |
+find_package(Libintl REQUIRED) |
+find_package(Intl REQUIRED) |
|
|
-set(incDirList ${SDL_INCLUDE_DIR} ${SDLIMAGE_INCLUDE_DIR} ${SDLTTF_INCLUDE_DIR} ${SDLMIXER_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
|
if(${MINGW}) |
-set(libList ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} ${SDLMIXER_LIBRARY} ${OPENGL_LIBRARIES})
|
set(LIBINTL_LIBRARIES intl) |
+set(incDirList ${GETTEXT_INCLUDE_DIR} ${LIBINTL_INCLUDE_DIR} ${SDL_INCLUDE_DIR} ${SDLIMAGE_INCLUDE_DIR} ${SDLTTF_INCLUDE_DIR} ${SDLMIXER_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
|
endif(${MINGW}) |
+set(libList ${LIBINTL_LIBRARIES} ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} ${SDLMIXER_LIBRARY} ${OPENGL_LIBRARIES})
|
|
|
-set(incDirList ${SDL_INCLUDE_DIR} ${SDLIMAGE_INCLUDE_DIR} ${SDLTTF_INCLUDE_DIR} ${SDLMIXER_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${LIBINTL_INCLUDE_DIR}) |
include_directories(${incDirList})
|
-set(libList ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} ${SDLMIXER_LIBRARY} ${OPENGL_LIBRARIES} ${Boost_LIBRARIES} ${LIBINTL_LIBRARIES}) |
|
+set(incDirList ${SDL_INCLUDE_DIR} ${SDLIMAGE_INCLUDE_DIR} ${SDLTTF_INCLUDE_DIR} ${SDLMIXER_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${Intl_INCLUDE_DIRS}) |
@@ -100,4 +102,4 @@ install(DIRECTORY
|
+set(libList ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} ${SDLMIXER_LIBRARY} ${OPENGL_LIBRARIES} ${Boost_LIBRARIES} ${Intl_LIBRARIES}) |
music
|
|
DESTINATION ${relResPath}
|
if (DEFINED LOCALE_INSTALL_DIR) |
PATTERN ".*" EXCLUDE
|
set(LOCALEDIR "${LOCALE_INSTALL_DIR}") |
-PATTERN "*~" EXCLUDE) |
|
\ No newline at end of file |
|
+PATTERN "*~" EXCLUDE) |
|