[Patch] CMake 2.6 support for external libintl and iconv (brought by KDE on Windows)

[Abdelrazak Younes]

Hello,

I need this patch to properly compile LyX and tex2lyx.

Peter (or anyone else) could you please have a look?

Thanks in advance,
Abdel.

Index: development/cmake/CMakeLists.txt
===================================================================
--- development/cmake/CMakeLists.txt    (revision 24288)
+++ development/cmake/CMakeLists.txt    (working copy)
@@ -304,7 +304,9 @@
        ${TOP_SRC_DIR}/boost)
 
 add_subdirectory(boost)
-add_subdirectory(intl)
+if (!win32)
+       add_subdirectory(intl)
+endif()
 add_subdirectory(src)
 
 include(../Install)
Index: development/cmake/src/CMakeLists.txt
===================================================================
--- development/cmake/src/CMakeLists.txt        (revision 24288)
+++ development/cmake/src/CMakeLists.txt        (working copy)
@@ -64,9 +64,10 @@
        frontend_qt4
        graphics
        support
-       intl
        ${QT_QTMAIN_LIBRARY}
-       ${vld_dll})
+       ${vld_dll}
+       iconv
+       libintl)
 
 if(ASPELL_FOUND)
        target_link_libraries(lyx ${ASPELL_LIBRARY})
Index: development/cmake/src/tex2lyx/CMakeLists.txt
===================================================================
--- development/cmake/src/tex2lyx/CMakeLists.txt        (revision 24288)
+++ development/cmake/src/tex2lyx/CMakeLists.txt        (working copy)
@@ -59,7 +59,8 @@
        support
        boost_regex
        ${QT_QTCORE_LIBRARY} 
-       intl)
+       iconv
+       libintl)
        
 if(WIN32)
        target_link_libraries(tex2lyx shlwapi)