anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove 3rdparty-build for iconv and zlib on unix.

Browse Source
This commit is contained in:
Kornel Benko 2015-12-20 11:49:38 +01:00
parent 1b8067a94b
commit 435db257e6
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -676,15 +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(3rdparty/libiconv)
set(HAVE_ICONV_CONST 1)
add_subdirectory(3rdparty/zlib)
endif()
if(LYX_EXTERNAL_BOOST)
message(STATUS "Searching for boost")
if(LYX_USE_STD_REGEX)