kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Use zlib built with cmake on Windows

Browse source
This commit is contained in:
Ilya Fedin 2021-09-27 09:24:08 +04:00 • committed by John Preston
parent 41ff5e28cd
commit f9b8a35464
2 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
external/minizip/CMakeLists.txt vendored
View file

@ -17,14 +17,6 @@ if (DESKTOP_APP_USE_PACKAGED)
endif() endif()
endif() endif()
if (WIN32)
target_include_directories(external_minizip SYSTEM
INTERFACE
${libs_loc}/zlib/contrib/minizip
)
return()
endif()
add_library(external_minizip_bundled STATIC) add_library(external_minizip_bundled STATIC)
init_target(external_minizip_bundled "(external)") init_target(external_minizip_bundled "(external)")
@ -46,6 +38,11 @@ PUBLIC
${minizip_loc} ${minizip_loc}
) )
target_link_libraries(external_minizip_bundled
PRIVATE
desktop-app::external_zlib
)
target_link_libraries(external_minizip target_link_libraries(external_minizip
INTERFACE INTERFACE
external_minizip_bundled external_minizip_bundled

14
external/zlib/CMakeLists.txt vendored
View file

@ -17,17 +17,11 @@ add_library(external_zlib STATIC IMPORTED GLOBAL)
add_library(desktop-app::external_zlib ALIAS external_zlib) add_library(desktop-app::external_zlib ALIAS external_zlib)
if (WIN32) if (WIN32)
target_compile_definitions(external_zlib INTERFACE ZLIB_WINAPI) set(zlib_lib_loc ${libs_loc}/zlib)
target_include_directories(external_zlib SYSTEM INTERFACE ${libs_loc}/zlib) target_include_directories(external_zlib SYSTEM INTERFACE ${zlib_lib_loc})
if (build_win64)
set(zlib_config_folder x64)
else()
set(zlib_config_folder x86)
endif()
set(zlib_lib_loc ${libs_loc}/zlib/contrib/vstudio/vc14/${zlib_config_folder})
set_target_properties(external_zlib PROPERTIES set_target_properties(external_zlib PROPERTIES
IMPORTED_LOCATION "${zlib_lib_loc}/ZlibStatReleaseWithoutAsm/zlibstat.lib" IMPORTED_LOCATION "${zlib_lib_loc}/Release/zlibstatic.lib"
IMPORTED_LOCATION_DEBUG "${zlib_lib_loc}/ZlibStatDebug/zlibstat.lib" IMPORTED_LOCATION_DEBUG "${zlib_lib_loc}/Debug/zlibstaticd.lib"
) )
elseif (APPLE) elseif (APPLE)
set_target_properties(external_zlib PROPERTIES set_target_properties(external_zlib PROPERTIES