mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 10:00:33 +00:00
cmake: more cleanup
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34964 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
0bcf9a01a0
commit
23cfb00ef1
@ -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)
|
||||
|
@ -66,6 +66,10 @@
|
||||
#define USE_HUNSPELL 1
|
||||
#endif
|
||||
|
||||
#cmakedefine LYX_NLS 1
|
||||
#ifdef LYX_NLS
|
||||
#define ENABLE_NLS
|
||||
#endif
|
||||
|
||||
|
||||
#endif // config.h guard
|
||||
|
@ -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)
|
||||
|
@ -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)
|
||||
|
||||
|
@ -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}
|
||||
|
Loading…
Reference in New Issue
Block a user