cmake: more cleanup

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34964 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt
index 7bd742d58f47cca8b6072fb2babd484ffdb030c3..a99547253f7a6852ae4d0fb7bfd6a93c3f6b8923 100644 (file)
--- a/development/cmake/CMakeLists.txt
+++ b/development/cmake/CMakeLists.txt
@@ -250,6 +250,7 @@ add_definitions(-DQT_NO_STL -DQT_NO_KEYWORDS)
 
 find_package(ZLIB REQUIRED)
 
+
 if(LYX_ASPELL)
        find_package(ASPELL)
        include_directories(${ASPELL_INCLUDE_DIR})
@@ -270,6 +271,16 @@ if(LYX_HUNSPELL)
        include_directories(${HUNSPELL_INCLUDE_DIR})
 endif()
 
+if(LYX_NLS)
+       FIND_PROGRAM(LYX_PYTHON_EXECUTABLE python)
+       if(${LYX_PYTHON_EXECUTABLE} MATCHES "-NOTFOUND")
+               message(FATAL_ERROR "Python 2.6 needed!")
+       endif()
+       find_package(LyXGettext REQUIRED)
+       include_directories(${TOP_SRC_DIR}/po)
+endif()
+
+
 if(LYX_USE_EXTERNAL_LIBINTL)
        find_package(Libintl REQUIRED)
        add_definitions(-DHAVE_GETTEXT)
@@ -278,11 +289,6 @@ endif()
 
 
 
-if(LYX_NLS)
-       add_definitions(-DENABLE_NLS=1)
-endif()
-
-
 if(WIN32)
        if(LYX_NO_CONSOLE)
                set(WIN32_CONSOLE WIN32)
@@ -418,14 +424,6 @@ if(MSVC)
 
 endif()
 
-FIND_PROGRAM(LYX_PYTHON_EXECUTABLE python)
-if( NOT ${LYX_PYTHON_EXECUTABLE} MATCHES "-NOTFOUND")
-    if(LYX_NLS)
-      find_package(LyXGettext REQUIRED)
-      include_directories(${TOP_SRC_DIR}/po)
-      add_subdirectory(po)
-    endif()
-endif()
 
 if(LYX_DEBUG_GLIBC)
   set(_GLIBCXX_DEBUG 1)
@@ -490,6 +488,9 @@ if(LYX_INSTALL)
 endif()
 add_subdirectory(lyx2lyx)
 add_subdirectory(scripts)
+if(LYX_NLS)
+       add_subdirectory(po)
+endif()
 
 if(LYX_INSTALL)
        include(../Install)

diff --git a/development/cmake/config.h.cmake b/development/cmake/config.h.cmake
index 8e5768f12a7abd2bc4c51cc796ed8444c41f7cd8..04feedf5795272692fd58b914dfc99b9fe99843e 100644 (file)
--- a/development/cmake/config.h.cmake
+++ b/development/cmake/config.h.cmake
@@ -66,6 +66,10 @@
 #define USE_HUNSPELL 1
 #endif
 
+#cmakedefine LYX_NLS 1
+#ifdef LYX_NLS
+#define ENABLE_NLS
+#endif
 
 
 #endif // config.h guard

diff --git a/development/cmake/modules/FindICONV.cmake b/development/cmake/modules/FindICONV.cmake
index 194a45ed6c73de2a00f413163e7ea9e40ef46551..b312a09235cd006ff7731b1b860545df8ba292ab 100644 (file)
--- a/development/cmake/modules/FindICONV.cmake
+++ b/development/cmake/modules/FindICONV.cmake
@@ -96,4 +96,4 @@ else()
    endif()
 endif()
 
-mark_as_advanced(ICONV_LIBRARY ICONV_INCLUDE_DIR)
+mark_as_advanced(ICONV_LIBRARY ICONV_INCLUDE_DIR ICONV_DLL ICONV_DLL_HELP)

diff --git a/development/cmake/modules/FindLyXGettext.cmake b/development/cmake/modules/FindLyXGettext.cmake
index 1ca0cfbfd378b6c94a318f12acc200fac3095bc6..3bc768e3314cf43dbf4480c98a1f78d400ae59cf 100755 (executable)
--- a/development/cmake/modules/FindLyXGettext.cmake
+++ b/development/cmake/modules/FindLyXGettext.cmake
@@ -13,8 +13,9 @@
 #    building the default target.
 
 FIND_PROGRAM(GETTEXT_MSGMERGE_EXECUTABLE msgmerge)
-
 FIND_PROGRAM(GETTEXT_MSGFMT_EXECUTABLE msgfmt)
+FIND_PROGRAM(GETTEXT_XGETTEXT_EXECUTABLE xgettext)
+FIND_PROGRAM(GETTEXT_MSGUNIQ_EXECUTABLE msguniq)
 
 MACRO(GETTEXT_CREATE_TRANSLATIONS _potFile _firstPoFile)
 
@@ -69,5 +70,5 @@ ELSE (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE )
    ENDIF (GetText_REQUIRED)
 ENDIF (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE )
 
-
+mark_as_advanced(GETTEXT_MSGMERGE_EXECUTABLE GETTEXT_MSGFMT_EXECUTABLE GETTEXT_XGETTEXT_EXECUTABLE GETTEXT_MSGUNIQ_EXECUTABLE)
 

diff --git a/development/cmake/po/CMakeLists.txt b/development/cmake/po/CMakeLists.txt
index 512f3e820651f564c42d0e0a68ae1531cbc7cbb1..ed3128d37ba020d3ac3ce9d874208389ecbe67d4 100755 (executable)
--- a/development/cmake/po/CMakeLists.txt
+++ b/development/cmake/po/CMakeLists.txt
@@ -59,9 +59,6 @@ add_gettext_python(ui lib/ui *.ui *.inc)
 add_gettext_python(external lib external_templates)
 add_gettext_python(formats lib configure.py)
 
-FIND_PROGRAM(GETTEXT_XGETTEXT_EXECUTABLE xgettext)
-FIND_PROGRAM(GETTEXT_MSGUNIQ_EXECUTABLE msguniq)
-
 ADD_CUSTOM_COMMAND(
     OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.cat.pot"
     COMMAND ${LYX_PYTHON_EXECUTABLE}