anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake: gettext patch from Kornel

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27931 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2008-12-20 09:25:55 +00:00
parent 4f34acd2d9
commit b581607b55
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
development/cmake/CMakeLists.txt
View File

@ -28,8 +28,8 @@ set(PACKAGE_VERSION 2.0svn)
set(LYX_DATE "2008/2009") set(LYX_DATE "2008/2009")
#TODO #TODO
set(VERSION_INFO "CMake Build") set(VERSION_INFO "CMake Build")
set(LYX_DIR_VER "LYX_DIR_16x") set(LYX_DIR_VER "LYX_DIR_20x")
set(LYX_USERDIR_VER "LYX_USERDIR_16x") set(LYX_USERDIR_VER "LYX_USERDIR_20x")
set(PROGRAM_SUFFIX "") set(PROGRAM_SUFFIX "")
set(LYX_ABS_INSTALLED_DATADIR "/usr/local/share/lyx${PACKAGE_VERSION}") set(LYX_ABS_INSTALLED_DATADIR "/usr/local/share/lyx${PACKAGE_VERSION}")
@ -58,6 +58,7 @@ include(LyXPaths)
include(LyXMacros) include(LyXMacros)
include(ProjectSourceGroup) include(ProjectSourceGroup)
if(merge OR merge_rebuild) if(merge OR merge_rebuild)
set(merge 1 CACHE TYPE STRING FORCE) set(merge 1 CACHE TYPE STRING FORCE)
set(MERGE_FILES 1 CACHE TYPE STRING FORCE) set(MERGE_FILES 1 CACHE TYPE STRING FORCE)
@ -317,6 +318,7 @@ configure_file(config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
find_package(ICONV REQUIRED) find_package(ICONV REQUIRED)
add_definitions(-DHAVE_ICONV=1) add_definitions(-DHAVE_ICONV=1)
find_package(Gettext)
#TODO: insource is not the best place #TODO: insource is not the best place

2
development/cmake/ConfigureChecks.cmake
View File

@ -46,6 +46,7 @@ check_include_files(argz.h HAVE_ARGZ_H)
check_function_exists(open HAVE_OPEN) check_function_exists(open HAVE_OPEN)
check_function_exists(chmod HAVE_CHMOD) check_function_exists(chmod HAVE_CHMOD)
check_function_exists(close HAVE_CLOSE) check_function_exists(close HAVE_CLOSE)
check_function_exists(dcgettext HAVE_DCGETTEXT)
check_function_exists(popen HAVE_POPEN) check_function_exists(popen HAVE_POPEN)
check_function_exists(pclose HAVE_PCLOSE) check_function_exists(pclose HAVE_PCLOSE)
check_function_exists(_open HAVE__OPEN) check_function_exists(_open HAVE__OPEN)
@ -53,6 +54,7 @@ check_function_exists(_close HAVE__CLOSE)
check_function_exists(_popen HAVE__POPEN) check_function_exists(_popen HAVE__POPEN)
check_function_exists(_pclose HAVE__PCLOSE) check_function_exists(_pclose HAVE__PCLOSE)
check_function_exists(getpid HAVE_GETPID) check_function_exists(getpid HAVE_GETPID)
check_function_exists(gettext HAVE_GETTEXT)
check_function_exists(_getpid HAVE__GETPID) check_function_exists(_getpid HAVE__GETPID)
check_function_exists(mkdir HAVE_MKDIR) check_function_exists(mkdir HAVE_MKDIR)
check_function_exists(_mkdir HAVE__MKDIR) check_function_exists(_mkdir HAVE__MKDIR)

9
development/cmake/configCompiler.h.cmake
View File

@ -35,6 +35,7 @@
#cmakedefine HAVE_OPEN 1 #cmakedefine HAVE_OPEN 1
#cmakedefine HAVE_CHMOD 1 #cmakedefine HAVE_CHMOD 1
#cmakedefine HAVE_CLOSE 1 #cmakedefine HAVE_CLOSE 1
#cmakedefine HAVE_DCGETTEXT 1
#cmakedefine HAVE_POPEN 1 #cmakedefine HAVE_POPEN 1
#cmakedefine HAVE_PCLOSE 1 #cmakedefine HAVE_PCLOSE 1
#cmakedefine HAVE__OPEN 1 #cmakedefine HAVE__OPEN 1
@ -43,6 +44,7 @@
#cmakedefine HAVE__PCLOSE 1 #cmakedefine HAVE__PCLOSE 1
#cmakedefine HAVE_GETPID 1 #cmakedefine HAVE_GETPID 1
#cmakedefine HAVE__GETPID 1 #cmakedefine HAVE__GETPID 1
#cmakedefine HAVE_GETTEXT 1
#cmakedefine HAVE_MKDIR 1 #cmakedefine HAVE_MKDIR 1
#cmakedefine HAVE__MKDIR 1 #cmakedefine HAVE__MKDIR 1
#cmakedefine HAVE_PUTENV 1 #cmakedefine HAVE_PUTENV 1
@ -96,13 +98,18 @@
# endif # endif
#endif #endif
#cmakedefine GETTEXT_FOUND 1
#if GETTEXT_FOUND
#define ENABLE_NLS 1
#define HAVE_LC_MESSAGES 1
#endif
#cmakedefine HAVE_ALLOCA 1 #cmakedefine HAVE_ALLOCA 1
#cmakedefine HAVE_SYMBOL_ALLOCA 1 #cmakedefine HAVE_SYMBOL_ALLOCA 1
#if defined(HAVE_SYMBOL_ALLOCA) && !defined(HAVE_ALLOCA) #if defined(HAVE_SYMBOL_ALLOCA) && !defined(HAVE_ALLOCA)
#define HAVE_ALLOCA #define HAVE_ALLOCA
#endif #endif
#cmakedefine HAVE_ICONV_CONST 1 #cmakedefine HAVE_ICONV_CONST 1
#ifdef HAVE_ICONV_CONST #ifdef HAVE_ICONV_CONST
#define ICONV_CONST const #define ICONV_CONST const