anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake: more logs for intl support

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38751 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2011-05-14 09:26:47 +00:00
parent 85733c6f6e
commit 145680fcf2
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
development/cmake/modules/FindLibintl.cmake
View File

@ -22,7 +22,7 @@ endif(LIBINTL_INCLUDE_DIR AND LIBINTL_LIB_FOUND)
find_path(LIBINTL_INCLUDE_DIR libintl.h) find_path(LIBINTL_INCLUDE_DIR libintl.h)
find_file(LIBINTL_HEADER iconv.h find_file(LIBINTL_HEADER libintl.h
PATHS ${LIBINTL_INCLUDE_DIR} NO_DEFAULT_PATH) PATHS ${LIBINTL_INCLUDE_DIR} NO_DEFAULT_PATH)
set(LIBINTL_LIB_FOUND FALSE) set(LIBINTL_LIB_FOUND FALSE)

2
development/cmake/modules/FindZLIB.cmake
View File

@ -14,7 +14,7 @@ find_path(ZLIB_INCLUDE_DIR zlib.h PATHS
/usr/local/include /usr/local/include
"${GNUWIN32_DIR}"/include) "${GNUWIN32_DIR}"/include)
find_file(ZLIB_HEADER iconv.h find_file(ZLIB_HEADER zlib.h
PATHS ${ZLIB_INCLUDE_DIR} NO_DEFAULT_PATH) PATHS ${ZLIB_INCLUDE_DIR} NO_DEFAULT_PATH)
set(POTENTIAL_Z_LIBS z zlib zdll) set(POTENTIAL_Z_LIBS z zlib zdll)

4
src/CMakeLists.txt
View File

@ -76,10 +76,6 @@ if (LYX_DEVEL_VERSION)
add_definitions(-DDEVEL_VERSION) add_definitions(-DDEVEL_VERSION)
endif() endif()
if(APPLE)
list(APPEND dont_merge ${TOP_SRC_DIR}/src/TexRow.cpp)
endif()
if (LYX_MERGE_FILES) if (LYX_MERGE_FILES)
if(dont_merge) if(dont_merge)