21 lines
1.1 KiB
Text
21 lines
1.1 KiB
Text
--- CMakeLists.txt.orig 2016-01-04 20:15:21 UTC
|
|
+++ CMakeLists.txt
|
|
@@ -12,15 +12,14 @@ find_package(Boost COMPONENTS filesystem
|
|
add_definitions(-DBOOST_FILESYSTEM_VERSION=3)
|
|
|
|
# Searching for libintl using bundled CMake script
|
|
-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/lib/fcitx/cmake")
|
|
-include(FindLibintl)
|
|
+include(FindIntl)
|
|
|
|
if(${MINGW})
|
|
set(LIBINTL_LIBRARIES intl)
|
|
endif(${MINGW})
|
|
|
|
-set(incDirList ${SDL_INCLUDE_DIR} ${SDLIMAGE_INCLUDE_DIR} ${SDLTTF_INCLUDE_DIR} ${SDLMIXER_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${LIBINTL_INCLUDE_DIR})
|
|
-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_DIR})
|
|
+set(libList ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} ${SDLMIXER_LIBRARY} ${OPENGL_LIBRARIES} ${Boost_LIBRARIES} ${Intl_LIBRARIES})
|
|
|
|
if (DEFINED LOCALE_INSTALL_DIR)
|
|
set(LOCALEDIR "${LOCALE_INSTALL_DIR}")
|