OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-04 18:06:22 +03:00
Code Packages Releases Activity

0031178: Configuration, genproj - fix searching for zlib on Linux platform

Browse Source 
zlib library is called libz on Linux.
This commit is contained in:
kgv 2019-11-19 20:21:00 +03:00 committed by bugmaster
parent 51ee6a7dbb
commit 6a56fe9240
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
adm/genconf.tcl
View File

@ -198,7 +198,11 @@ proc wokdep:gui:UpdateList {} {
} }
if { "$::HAVE_ZLIB" == "true" } { if { "$::HAVE_ZLIB" == "true" } {
wokdep:SearchStandardLibrary anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs "zlib" "zlib.h" "zlib" {"zlib"} set aCheckLib "z"
if { "$::tcl_platform(platform)" == "windows" } {
set aCheckLib "zlib"
}
wokdep:SearchStandardLibrary anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs "zlib" "zlib.h" "$aCheckLib" {"zlib"}
} }
if { "$::HAVE_LIBLZMA" == "true" } { if { "$::HAVE_LIBLZMA" == "true" } {
set aCheckLib "lzma" set aCheckLib "lzma"

6
adm/genproj.tcl
View File

@ -1371,7 +1371,7 @@ proc osutils:csfList { theOS theCsfLibsMap theCsfFrmsMap } {
} }
} }
if { "$::HAVE_ZLIB" == "true" } { if { "$::HAVE_ZLIB" == "true" } {
set aLibsMap(CSF_ZLIB) "zlib" set aLibsMap(CSF_ZLIB) "z"
} }
if { "$::HAVE_LIBLZMA" == "true" } { if { "$::HAVE_LIBLZMA" == "true" } {
set aLibsMap(CSF_LIBLZMA) "liblzma" set aLibsMap(CSF_LIBLZMA) "liblzma"
@ -1408,6 +1408,10 @@ proc osutils:csfList { theOS theCsfLibsMap theCsfFrmsMap } {
# tbb headers define different pragma lib depending on debug/release # tbb headers define different pragma lib depending on debug/release
set aLibsMap(CSF_TBB) "" set aLibsMap(CSF_TBB) ""
if { "$::HAVE_ZLIB" == "true" } {
set aLibsMap(CSF_ZLIB) "zlib"
}
} else { } else {
set aLibsMap(CSF_dl) "dl" set aLibsMap(CSF_dl) "dl"
if { "$theOS" == "mac" || "$theOS" == "ios" } { if { "$theOS" == "mac" || "$theOS" == "ios" } {