Author: kuemmel
Date: Sat May 14 11:22:35 2011
New Revision: 38750
URL: http://www.lyx.org/trac/changeset/38750
Log:
cmake: more logs for intl support
Modified:
lyx-devel/trunk/CMakeLists.txt
lyx-devel/trunk/development/cmake/modules/FindICONV.cmake
lyx-devel/trunk/development/cmake/modules/FindLibintl.cmake
lyx-devel/trunk/development/cmake/modules/FindZLIB.cmake
lyx-devel/trunk/intl/CMakeLists.txt
Modified: lyx-devel/trunk/CMakeLists.txt
==============================================================================
--- lyx-devel/trunk/CMakeLists.txt Sat May 14 09:47:18 2011 (r38749)
+++ lyx-devel/trunk/CMakeLists.txt Sat May 14 11:22:35 2011 (r38750)
@@ -51,7 +51,7 @@
# Options for all compilers/systems
LYX_OPTION(CPACK "Use the CPack management (Implies LYX_INSTALL
option)" OFF ALL)
LYX_OPTION(INSTALL "Build install projects/rules (implies a bunch of
other options)" OFF ALL)
-LYX_OPTION(NLS "Use nls" ON ALL)
+LYX_OPTION(NLS "Enable Native Language Support (NLS)" ON ALL)
LYX_OPTION(ASPELL "Require aspell" OFF ALL)
LYX_OPTION(ENCHANT "Require Enchant" OFF ALL)
LYX_OPTION(HUNSPELL "Require Hunspell" OFF ALL)
@@ -306,7 +306,7 @@
find_package(Qt4 REQUIRED)
-find_package(ZLIB REQUIRED)
+
include_directories(${TOP_BINARY_DIR} ${TOP_SRC_DIR}/src)
@@ -335,23 +335,22 @@
add_subdirectory(po "${TOP_BINARY_DIR}/po")
endif()
-if(LYX_EXTERNAL_LIBINTL)
- find_package(Libintl REQUIRED)
- if(DEFINED LIBINTL_LIBRARIES)
- # find getext when configuring
- list(APPEND CMAKE_REQUIRED_LIBRARIES ${LIBINTL_LIBRARIES})
- # on mac use iconv also form ports
- get_filename_component(ICONV_RELATIVE_TO_LIBINTL
${LIBINTL_LIBRARIES} PATH)
- endif()
-else()
- if(LYX_NLS)
- add_subdirectory(intl "${TOP_BINARY_DIR}/intl")
+if(LYX_NLS)
+ if(LYX_EXTERNAL_LIBINTL)
+ find_package(Libintl REQUIRED)
+ if(DEFINED LIBINTL_LIBRARIES)
+ # find getext when configuring
+ list(APPEND CMAKE_REQUIRED_LIBRARIES
${LIBINTL_LIBRARIES})
+ # on mac use iconv also form ports
+ get_filename_component(ICONV_RELATIVE_TO_LIBINTL
${LIBINTL_LIBRARIES} PATH)
+ endif()
else()
- # do not compile if nls disabled
+ add_subdirectory(intl "${TOP_BINARY_DIR}/intl")
endif()
endif()
find_package(ICONV REQUIRED)
+find_package(ZLIB REQUIRED)
if(LYX_EXTERNAL_BOOST)
message(STATUS "Searching for boost")
@@ -540,6 +539,22 @@
LYX_OPTION_LIST_ALL(used)
+if(LYX_NLS)
+ message(STATUS)
+ message(STATUS "Building Native Language Support (LYX_NLS is set), used
libraries:")
+ message(STATUS)
+ message(STATUS " * intl")
+ message(STATUS " - header : ${LIBINTL_HEADER}")
+ message(STATUS " - library: ${LIBINTL_LIBRARIES}")
+ message(STATUS " * iconv")
+ message(STATUS " - header : ${ICONV_HEADER}")
+ message(STATUS " - library: ${ICONV_LIBRARY}")
+ message(STATUS " * zlib")
+ message(STATUS " - header : ${ZLIB_HEADER}")
+ message(STATUS " - library: ${ZLIB_LIBRARY}")
+ message(STATUS)
+endif()
+
set(CPACK_PACKAGE_VERSION_MAJOR "${LYX_MAJOR_VERSION}")
set(CPACK_PACKAGE_VERSION_MINOR "${LYX_MINOR_VERSION}")
FILE(STRINGS "${TOP_SRC_DIR}/${LYX_CMAKE_DIR}/LyX_summary.txt"
CPACK_PACKAGE_DESCRIPTION_SUMMARY)
Modified: lyx-devel/trunk/development/cmake/modules/FindICONV.cmake
==============================================================================
--- lyx-devel/trunk/development/cmake/modules/FindICONV.cmake Sat May 14
09:47:18 2011 (r38749)
+++ lyx-devel/trunk/development/cmake/modules/FindICONV.cmake Sat May 14
11:22:35 2011 (r38750)
@@ -32,9 +32,12 @@
set(ICONV_FIND_QUIETLY TRUE)
endif()
-find_path(ICONV_INCLUDE_DIR iconv.h
+find_path(ICONV_INCLUDE_DIR iconv.h PATHS
/usr/include
/usr/local/include)
+
+find_file(ICONV_HEADER iconv.h
+ PATHS ${ICONV_INCLUDE_DIR} NO_DEFAULT_PATH)
set(POTENTIAL_ICONV_LIBS iconv libiconv libiconv2)
Modified: lyx-devel/trunk/development/cmake/modules/FindLibintl.cmake
==============================================================================
--- lyx-devel/trunk/development/cmake/modules/FindLibintl.cmake Sat May 14
09:47:18 2011 (r38749)
+++ lyx-devel/trunk/development/cmake/modules/FindLibintl.cmake Sat May 14
11:22:35 2011 (r38750)
@@ -22,6 +22,9 @@
find_path(LIBINTL_INCLUDE_DIR libintl.h)
+find_file(LIBINTL_HEADER iconv.h
+ PATHS ${LIBINTL_INCLUDE_DIR} NO_DEFAULT_PATH)
+
set(LIBINTL_LIB_FOUND FALSE)
if(LIBINTL_INCLUDE_DIR)
Modified: lyx-devel/trunk/development/cmake/modules/FindZLIB.cmake
==============================================================================
--- lyx-devel/trunk/development/cmake/modules/FindZLIB.cmake Sat May 14
09:47:18 2011 (r38749)
+++ lyx-devel/trunk/development/cmake/modules/FindZLIB.cmake Sat May 14
11:22:35 2011 (r38750)
@@ -9,14 +9,23 @@
set(ZLIB_FIND_QUIETLY TRUE)
endif()
-find_path(ZLIB_INCLUDE_DIR zlib.h
+find_path(ZLIB_INCLUDE_DIR zlib.h PATHS
/usr/include
/usr/local/include
"${GNUWIN32_DIR}"/include)
+find_file(ZLIB_HEADER iconv.h
+ PATHS ${ZLIB_INCLUDE_DIR} NO_DEFAULT_PATH)
+
set(POTENTIAL_Z_LIBS z zlib zdll)
find_library(ZLIB_LIBRARY NAMES ${POTENTIAL_Z_LIBS}
+ PATHS
+ ${ICONV_RELATIVE_TO_LIBINTL}
+ NO_DEFAULT_PATH)
+
+
+find_library(ZLIB_LIBRARY NAMES ${POTENTIAL_Z_LIBS}
PATHS
"C:\\Programme\\Microsoft Visual Studio 8\\VC\\lib"
/usr/lib /usr/local/lib
Modified: lyx-devel/trunk/intl/CMakeLists.txt
==============================================================================
--- lyx-devel/trunk/intl/CMakeLists.txt Sat May 14 09:47:18 2011 (r38749)
+++ lyx-devel/trunk/intl/CMakeLists.txt Sat May 14 11:22:35 2011 (r38750)
@@ -7,8 +7,8 @@
project(intl)
# libgnuintl.h.in => libintl.h
-configure_file("${TOP_SRC_DIR}/${LYX_CMAKE_DIR}/intl/libgnuintl.h.cmake"
${CMAKE_CURRENT_BINARY_DIR}/libgnuintl.h)
-configure_file("${TOP_SRC_DIR}/${LYX_CMAKE_DIR}/intl/libgnuintl.h.cmake"
${CMAKE_CURRENT_BINARY_DIR}/libintl.h)
+configure_file("${TOP_SRC_DIR}/${LYX_CMAKE_DIR}/intl/libgnuintl.h.cmake"
${CMAKE_BINARY_DIR}/intl/libgnuintl.h)
+configure_file("${TOP_SRC_DIR}/${LYX_CMAKE_DIR}/intl/libgnuintl.h.cmake"
${CMAKE_BINARY_DIR}/intl/libintl.h)
add_definitions(
@@ -50,8 +50,16 @@
endif()
add_library(intl STATIC ${intl_sources} ${intl_headers})
-set(LIBINTL_LIBRARIES intl CACHE STRING "libintl library" FORCE)
+get_target_property(libintl_location intl LOCATION)
+set(LIBINTL_LIBRARIES ${libintl_location} CACHE STRING "libintl library" FORCE)
+
+find_path(LIBINTL_INCLUDE_DIR intl/libintl.h
+ PATHS ${CMAKE_BINARY_DIR} NO_DEFAULT_PATH)
+
+find_file(LIBINTL_HEADER intl/libintl.h
+ PATHS ${CMAKE_BINARY_DIR} NO_DEFAULT_PATH)
+
if(ICONV_FOUND)
target_link_libraries(intl ${ICONV_LIBRARY})
endif()
