Author: kuemmel
Date: Sat May 14 11:26:47 2011
New Revision: 38751
URL: http://www.lyx.org/trac/changeset/38751
Log:
cmake: more logs for intl support
Modified:
lyx-devel/trunk/development/cmake/modules/FindLibintl.cmake
lyx-devel/trunk/development/cmake/modules/FindZLIB.cmake
lyx-devel/trunk/src/CMakeLists.txt
Modified: lyx-devel/trunk/development/cmake/modules/FindLibintl.cmake
==============================================================================
--- lyx-devel/trunk/development/cmake/modules/FindLibintl.cmake Sat May 14
11:22:35 2011 (r38750)
+++ lyx-devel/trunk/development/cmake/modules/FindLibintl.cmake Sat May 14
11:26:47 2011 (r38751)
@@ -22,7 +22,7 @@
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)
set(LIBINTL_LIB_FOUND FALSE)
Modified: lyx-devel/trunk/development/cmake/modules/FindZLIB.cmake
==============================================================================
--- lyx-devel/trunk/development/cmake/modules/FindZLIB.cmake Sat May 14
11:22:35 2011 (r38750)
+++ lyx-devel/trunk/development/cmake/modules/FindZLIB.cmake Sat May 14
11:26:47 2011 (r38751)
@@ -14,7 +14,7 @@
/usr/local/include
"${GNUWIN32_DIR}"/include)
-find_file(ZLIB_HEADER iconv.h
+find_file(ZLIB_HEADER zlib.h
PATHS ${ZLIB_INCLUDE_DIR} NO_DEFAULT_PATH)
set(POTENTIAL_Z_LIBS z zlib zdll)
Modified: lyx-devel/trunk/src/CMakeLists.txt
==============================================================================
--- lyx-devel/trunk/src/CMakeLists.txt Sat May 14 11:22:35 2011 (r38750)
+++ lyx-devel/trunk/src/CMakeLists.txt Sat May 14 11:26:47 2011 (r38751)
@@ -76,10 +76,6 @@
add_definitions(-DDEVEL_VERSION)
endif()
-if(APPLE)
- list(APPEND dont_merge ${TOP_SRC_DIR}/src/TexRow.cpp)
-endif()
-
if (LYX_MERGE_FILES)
if(dont_merge)
