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
solvespace · Mar 15, 2020 · e355a09 · e355a09
1 parent 7e33d2d
commit e355a09
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -144,11 +144,9 @@ if(WIN32 OR APPLE)
     include(FindVendoredPackage)
     include(AddVendoredSubdirectory)
 
-    if(APPLE)
-        set(FORCE_VENDORED_ZLIB     ON)
-        set(FORCE_VENDORED_PNG      ON)
-        set(FORCE_VENDORED_Freetype ON)
-    endif()
+    set(FORCE_VENDORED_ZLIB     ON)
+    set(FORCE_VENDORED_PNG      ON)
+    set(FORCE_VENDORED_Freetype ON)
 
     find_vendored_package(ZLIB zlib
         ZLIB_LIBRARY            zlibstatic