zcy
/
solvespace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Force vendor zlib, png, and FreeType on Win32, too 

This has lead to linker problems if the environment does have standard
versions of zlib/png (like from MSYS2), see discussion in referenced
issue

Closes #559
pull/564/head
nabijaczleweli 2020-03-14 01:24:45 +01:00 committed by whitequark
parent 7e33d2daec
commit e355a095c4
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -144,11 +144,9 @@ if(WIN32 OR APPLE)
include(FindVendoredPackage) include(FindVendoredPackage)
include(AddVendoredSubdirectory) include(AddVendoredSubdirectory)
if(APPLE) set(FORCE_VENDORED_ZLIB ON)
set(FORCE_VENDORED_ZLIB ON) set(FORCE_VENDORED_PNG ON)
set(FORCE_VENDORED_PNG ON) set(FORCE_VENDORED_Freetype ON)
set(FORCE_VENDORED_Freetype ON)
endif()
find_vendored_package(ZLIB zlib find_vendored_package(ZLIB zlib
ZLIB_LIBRARY zlibstatic ZLIB_LIBRARY zlibstatic