mirror of
https://github.com/NGSolve/netgen.git
synced 2024-11-11 16:49:16 +05:00
Fix linking zlib in MacOS pip builds
This commit is contained in:
parent
fd7e5867b4
commit
a009825d83
@ -151,9 +151,11 @@ if(BUILD_ZLIB)
|
|||||||
# force linking the static library
|
# force linking the static library
|
||||||
set(ZLIB_INCLUDE_DIRS ${ZLIB_ROOT}/include)
|
set(ZLIB_INCLUDE_DIRS ${ZLIB_ROOT}/include)
|
||||||
set(ZLIB_LIBRARIES ${ZLIB_ROOT}/lib/zlibstatic.lib)
|
set(ZLIB_LIBRARIES ${ZLIB_ROOT}/lib/zlibstatic.lib)
|
||||||
|
set(ZLIB_LIBRARY_RELEASE ${ZLIB_ROOT}/lib/zlibstatic.lib)
|
||||||
elseif(WIN32)
|
elseif(WIN32)
|
||||||
set(ZLIB_INCLUDE_DIRS ${ZLIB_ROOT}/include)
|
set(ZLIB_INCLUDE_DIRS ${ZLIB_ROOT}/include)
|
||||||
set(ZLIB_LIBRARIES ${ZLIB_ROOT}/lib/libz.a)
|
set(ZLIB_LIBRARIES ${ZLIB_ROOT}/lib/libz.a)
|
||||||
|
set(ZLIB_LIBRARY_RELEASE ${ZLIB_ROOT}/lib/libz.a)
|
||||||
endif(WIN32)
|
endif(WIN32)
|
||||||
else()
|
else()
|
||||||
include(cmake/external_projects/zlib.cmake)
|
include(cmake/external_projects/zlib.cmake)
|
||||||
@ -257,6 +259,7 @@ set_vars( NETGEN_CMAKE_ARGS
|
|||||||
OpenCascade_ROOT
|
OpenCascade_ROOT
|
||||||
ZLIB_INCLUDE_DIRS
|
ZLIB_INCLUDE_DIRS
|
||||||
ZLIB_LIBRARIES
|
ZLIB_LIBRARIES
|
||||||
|
ZLIB_LIBRARY_RELEASE
|
||||||
ZLIB_ROOT
|
ZLIB_ROOT
|
||||||
|
|
||||||
NGLIB_LIBRARY_TYPE
|
NGLIB_LIBRARY_TYPE
|
||||||
|
Loading…
Reference in New Issue
Block a user