Cmake export tests: Ignore some child documents

[lyx.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e65b2590d4ac74bde3fd4f53f0ec77b9034a7800..f657fd5cc350d1d2d4d9692e0347b2cb083b1710 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -613,7 +613,7 @@ set(Spelling_FOUND OFF)
 set(Include_used_spellchecker)   # String will be inserted into config.h
 
 if(LYX_3RDPARTY_BUILD)
-    add_subdirectory(src/3rdparty/hunspell)
+    add_subdirectory(3rdparty/hunspell)
     add_definitions(-DHUNSPELL_STATIC)
     set(HUNSPELL_FOUND ON)
     message(STATUS "  * Hunspell:")
@@ -676,14 +676,14 @@ endif()
 if(UNIX)
     find_package(ICONV REQUIRED)
     find_package(ZLIB REQUIRED)
+else()
+    if(LYX_3RDPARTY_BUILD)
+       add_subdirectory(3rdparty/libiconv)
+       set(HAVE_ICONV_CONST 1)
+       add_subdirectory(3rdparty/zlib)
+    endif()
 endif()
 
-if(LYX_3RDPARTY_BUILD)
-    add_subdirectory(src/3rdparty/libiconv)
-    add_subdirectory(src/3rdparty/zlib)
-endif()
-
-
 if(LYX_EXTERNAL_BOOST)
        message(STATUS "Searching for boost")
        if(LYX_USE_STD_REGEX)
@@ -713,8 +713,8 @@ else()
        endif()
        add_definitions(-DBOOST_USER_CONFIG="<config.h>")
        add_definitions(-DBOOST_SIGNALS_NO_DEPRECATION_WARNING=1)
-       include_directories(${TOP_SRC_DIR}/boost)
-       add_subdirectory(boost "${TOP_BINARY_DIR}/boost")
+       include_directories(${TOP_SRC_DIR}/3rdparty/boost)
+       add_subdirectory(3rdparty/boost "${TOP_BINARY_DIR}/3rdparty/boost")
 endif()