cmake: cleanup, merge two patches

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 19d1acb87b2b9b6a8ddf9a0f5dc0253105d02dba..e60af3221f71fe6c2b947996a203113cc62f3770 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -336,11 +336,11 @@ if(LYX_NLS)
 endif()
 
 if(LYX_EXTERNAL_LIBINTL)
-       find_package(Libintl REQUIRED)
-       # find getext when configuring
-       list(APPEND CMAKE_REQUIRED_LIBRARIES ${LIBINTL_LIBRARIES})
-       # on mac use iconv also form ports
+       find_package(Libintl REQUIRED)  
        if(DEFINED LIBINTL_LIBRARIES)
+               # find getext when configuring
+               list(APPEND CMAKE_REQUIRED_LIBRARIES ${LIBINTL_LIBRARIES})      
+               # on mac use iconv also form ports
                get_filename_component(ICONV_RELATIVE_TO_LIBINTL ${LIBINTL_LIBRARIES} PATH)
        endif()
 else()