Cmake export tests: Adapt exports to changed mathmacros path.

[lyx.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d03194a39c81fe4530469ae336f92a2fa459834c..8ad97de7ee056852e4212a5e89bf8f74b5b32d9f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -139,6 +139,7 @@ LYX_OPTION(ENABLE_URLTESTS  "Enable for URL tests" OFF ALL)
 LYX_OPTION(ENABLE_EXPORT_TESTS "Enable for export tests" OFF ALL)
 LYX_OPTION(ASAN             "Use address sanitizer" OFF ALL)
 LYX_COMBO(USE_QT            "Use Qt version as frontend" QT4 QT5)
+LYX_OPTION(3RDPARTY_BUILD   "Build 3rdparty libs" OFF ALL)
 
 # GCC specific
 LYX_OPTION(PROFILE              "Build profile version" OFF GCC)
@@ -612,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:")
@@ -678,8 +679,9 @@ if(UNIX)
 endif()
 
 if(LYX_3RDPARTY_BUILD)
-    add_subdirectory(src/3rdparty/libiconv)
-    add_subdirectory(src/3rdparty/zlib)
+    add_subdirectory(3rdparty/libiconv)
+    set(HAVE_ICONV_CONST 1)
+    add_subdirectory(3rdparty/zlib)
 endif()