From 145680fcf2d5dc0eb14b9ac41d226973341f6515 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20K=C3=BCmmel?= <syntheticpp@gmx.net>
Date: Sat, 14 May 2011 09:26:47 +0000
Subject: [PATCH] cmake: more logs for intl support

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38751 a592a061-630c-0410-9148-cb99ea01b6c8
---
 development/cmake/modules/FindLibintl.cmake | 2 +-
 development/cmake/modules/FindZLIB.cmake    | 2 +-
 src/CMakeLists.txt                          | 4 ----
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/development/cmake/modules/FindLibintl.cmake b/development/cmake/modules/FindLibintl.cmake
index d9d168eed1..745f8dd062 100644
--- a/development/cmake/modules/FindLibintl.cmake
+++ b/development/cmake/modules/FindLibintl.cmake
@@ -22,7 +22,7 @@ endif(LIBINTL_INCLUDE_DIR AND LIBINTL_LIB_FOUND)
 
 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)
diff --git a/development/cmake/modules/FindZLIB.cmake b/development/cmake/modules/FindZLIB.cmake
index 51fdbaf6a1..91223d3766 100644
--- a/development/cmake/modules/FindZLIB.cmake
+++ b/development/cmake/modules/FindZLIB.cmake
@@ -14,7 +14,7 @@ find_path(ZLIB_INCLUDE_DIR zlib.h PATHS
  /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)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b920452369..5a6615637f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -76,10 +76,6 @@ if (LYX_DEVEL_VERSION)
 	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)