require iconv

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14669 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt
index 89c0528f89502450b28fbbdd98d70b44b821915d..a89b0017717f6b2732e9bfcd4c723dd814b664a8 100644 (file)
--- a/development/cmake/CMakeLists.txt
+++ b/development/cmake/CMakeLists.txt
@@ -30,14 +30,8 @@ else(qt3)
 endif(qt3)     
 
 find_package(ZLIB REQUIRED)
 endif(qt3)     
 
 find_package(ZLIB REQUIRED)

-
-
-if(all OR nls)
-       find_package(ICONV REQUIRED)
-else(all OR nls)
-       find_package(ICONV)
-endif(all OR nls)
-set(nls)
+find_package(ICONV REQUIRED)
+add_definitions(-DHAVE_ICONV=1)

 
 if(all OR aspell)
        find_package(ASPELL REQUIRED)
 
 if(all OR aspell)
        find_package(ASPELL REQUIRED)


@@ -47,12 +41,11 @@ endif(all OR aspell)
 set(aspell)
 
 message("")
 set(aspell)
 
 message("")

-if(ICONV_FOUND)
-       add_definitions(-DENABLE_NLS=1 -DHAVE_ICONV=1)
+if(nls)
+       add_definitions(-DENABLE_NLS=1)

        message("----- Building with ENABLE_NLS and HAVE_ICONV")
        message("----- Building with ENABLE_NLS and HAVE_ICONV")

-else(ICONV_FOUND)
-       message("----- No iconv found, to get more information use -Dnls=1")
-endif(ICONV_FOUND)
+endif(nls)
+set(nls)

 if(ASPELL_FOUND)
        add_definitions(-DUSE_ASPELL=1)
        message("----- Building with USE_ASPELL")
 if(ASPELL_FOUND)
        add_definitions(-DUSE_ASPELL=1)
        message("----- Building with USE_ASPELL")