X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=0d4b6dd48b2a783f9c9e7f638c80a8f42a062c51;hb=73e03bb7d8b5e44c9d965ddf433db09dfb912db0;hp=0670356f4c7c7077a561e8e406b8ab5c2be406b3;hpb=900cbcd2adfd80b0060e1f906bd24e97052e3358;p=lyx.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0670356f4c..0d4b6dd48b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ set(CMAKE_MODULE_PATH "${TOP_MODULE_PATH}")
 set(CMAKE_PROJECT_NAME ${LYX_PROJECT})
 
 message(STATUS)
-if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) 
+if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
 	message(STATUS "Building in-source")
 	set(TOP_BINARY_DIR "${CMAKE_BINARY_DIR}/build")
 else()
@@ -31,6 +31,9 @@ else()
 	set(TOP_BINARY_DIR "${CMAKE_BINARY_DIR}")
 endif()
 
+# This directory should be used if some test uses lyx-executable
+set(LYX_TESTS_USERDIR "${TOP_BINARY_DIR}/Testing/.lyx")
+file(MAKE_DIRECTORY "${LYX_TESTS_USERDIR}")
 
 if(COMMAND cmake_policy)
 	cmake_policy(SET CMP0003 OLD)
@@ -92,7 +95,6 @@ LYX_OPTION(MERGE_FILES      "Merge source files into one compilation unit" OFF A
 LYX_OPTION(MERGE_REBUILD    "Rebuild generated files from merged files build" OFF ALL)
 LYX_OPTION(QUIET            "Don't generate verbose makefiles" OFF ALL)
 LYX_OPTION(INSTALL_PREFIX   "Install path for LyX" OFF ALL)
-LYX_OPTION(EXTERNAL_LIBINTL "Use external libintl" ON ALL)
 LYX_OPTION(BUNDLE           "Build bundle  (experimental) " OFF ALL)
 
 # GCC specific
@@ -511,33 +513,20 @@ endif()
 
 if(LYX_NLS)
 	FIND_PROGRAM(LYX_PYTHON_EXECUTABLE python2 python HINTS ${GNUWIN32_DIR}/python)
-	if(${LYX_PYTHON_EXECUTABLE} MATCHES "-NOTFOUND")
-		message(FATAL_ERROR "Python 2.6 needed!")
-	endif()
-	find_package(LyXGettext REQUIRED)
-	add_subdirectory(po "${TOP_BINARY_DIR}/po")
-endif()
-
-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()
+	find_package(LyXGettext)
+	if(LYX_PYTHON_EXECUTABLE AND GETTEXT_FOUND)
+		add_subdirectory(po "${TOP_BINARY_DIR}/po")
 	else()
-		add_subdirectory(intl "${TOP_BINARY_DIR}/intl")
+		# Install only supplied .gmo-files
+		file(GLOB _gmofiles RELATIVE "${TOP_SRC_DIR}/po" "${TOP_SRC_DIR}/po/*.gmo")
+		message(STATUS "Installing provided .gmo-files only")
+		foreach( _gmo ${_gmofiles})
+			string(REGEX REPLACE "\\.gmo$" "" _lang ${_gmo})
+			install(FILES "${TOP_SRC_DIR}/po/${_gmo}" DESTINATION ${LYX_DATA_SUBDIR}${LYX_LOCALEDIR}/${_lang}/LC_MESSAGES RENAME ${PACKAGE}.mo)
+		endforeach()
 	endif()
 endif()
 
-if(LYX_EXTERNAL_LIBINTL)
-	set(intl_link ${LIBINTL_LIBRARIES})
-else()
-	set(intl_link intl)
-endif()
-
 find_package(ICONV REQUIRED)
 find_package(ZLIB REQUIRED)
 
@@ -716,6 +705,9 @@ if (CMAKE_GENERATOR MATCHES Xcode)
     MESSAGE(STATUS "---- Using XCode compiler CMAKE_XCODE_ATTRIBUTE_GCC_VERSION=${CMAKE_XCODE_ATTRIBUTE_GCC_VERSION}")
 ENDIF(CMAKE_GENERATOR MATCHES Xcode)
 
+if (WIN32 AND Qt5Core_FOUND)
+	set(Z_PREFIX 1)
+endif()
 
 # compiler tests, config.h generation
 if(MSVC AND NOT LYX_CONFIGURE_CHECKS)
@@ -775,9 +767,6 @@ 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}")