mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
Ensure that iconv and zlib are always found
If the included thirdparty libs are requested, use them, even on unix. This is consistent with autotools (but the recommended way is of course to use the system libs). If the included thirdparty libs are not requested then try to find libiconv and zlib also on windows. This will lead to an error unless the libs are found via manually added include and link paths, but this is wanted since libiconv and zlib are not optional.
This commit is contained in:
parent
0147e1f857
commit
5ef180842c
@ -706,15 +706,13 @@ if(LYX_NLS)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(UNIX)
|
||||
find_package(ICONV REQUIRED)
|
||||
find_package(ZLIB REQUIRED)
|
||||
else()
|
||||
if(LYX_3RDPARTY_BUILD)
|
||||
if(LYX_3RDPARTY_BUILD)
|
||||
add_subdirectory(3rdparty/libiconv)
|
||||
set(HAVE_ICONV_CONST 1)
|
||||
add_subdirectory(3rdparty/zlib)
|
||||
endif()
|
||||
else()
|
||||
find_package(ICONV REQUIRED)
|
||||
find_package(ZLIB REQUIRED)
|
||||
endif()
|
||||
|
||||
if(LYX_EXTERNAL_BOOST)
|
||||
|
Loading…
Reference in New Issue
Block a user