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

0032655: Configuration, qmake - add missing CSF_Draco

Browse Source 
Added CSF_Draco to OccToolkit.pri.
Removed libXmu.so search from genconf.
This commit is contained in:
kgv 2021-11-10 14:21:02 +03:00 committed by inv
parent d4edeaed31
commit e77bcb6b57
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
adm/genconfdeps.tcl
View File

@ -1251,13 +1251,13 @@ proc wokdep:SearchX11 {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64
return "$isFound" return "$isFound"
} }
set aXmuLibPath [wokdep:SearchLib "Xmu" "$::ARCH"] set aX11LibPath [wokdep:SearchLib "X11" "$::ARCH"]
if { "$aXmuLibPath" == "" } { if { "$aX11LibPath" == "" } {
set aXmuLibPath [wokdep:SearchLib "Xmu" "$::ARCH" "/usr/X11/lib"] set aX11LibPath [wokdep:SearchLib "X11" "$::ARCH" "/usr/X11/lib"]
if { "$aXmuLibPath" != "" } { if { "$aX11LibPath" != "" } {
#lappend ::CSF_OPT_LIB$::ARCH "/usr/X11/lib" #lappend ::CSF_OPT_LIB$::ARCH "/usr/X11/lib"
} else { } else {
lappend anErrLib$::ARCH "Error: '${::SYS_LIB_PREFIX}Xmu.${::SYS_LIB_SUFFIX}' not found (X11)" lappend anErrLib$::ARCH "Error: '${::SYS_LIB_PREFIX}X11.${::SYS_LIB_SUFFIX}' not found (X11)"
set isFound "false" set isFound "false"
} }
} }

1
adm/qmake/OccToolkit.pri
View File

@ -26,6 +26,7 @@ HAVE_FFMPEG { CSF_FFmpeg = -lavcodec -lavformat -lswscale -lavutil }
HAVE_TBB { CSF_TBB = -ltbb -ltbbmalloc } HAVE_TBB { CSF_TBB = -ltbb -ltbbmalloc }
HAVE_ZLIB { CSF_ZLIB = -lzlib } HAVE_ZLIB { CSF_ZLIB = -lzlib }
HAVE_LIBLZMA { CSF_LIBLZMA = -lliblzma } HAVE_LIBLZMA { CSF_LIBLZMA = -lliblzma }
HAVE_DRACO { CSF_Draco = -ldraco }
win32 { win32 {
CSF_kernel32 = -lkernel32 CSF_kernel32 = -lkernel32
CSF_advapi32 = -ladvapi32 CSF_advapi32 = -ladvapi32

3
dox/build/build_3rdparty/building_3rdparty.md vendored
View File

@ -272,7 +272,8 @@ There are two types of third-party products, which are necessary to build OCCT:
All 3rd-party products required for building of OCCT could be installed All 3rd-party products required for building of OCCT could be installed
from official repositories. You may install them from console using apt-get utility: from official repositories. You may install them from console using apt-get utility:
sudo apt-get install tcllib tklib tcl-dev tk-dev libfreetype-dev libx11-dev libgl1-mesa-dev libfreeimage-dev rapidjson-dev sudo apt-get install tcllib tklib tcl-dev tk-dev libfreetype-dev libx11-dev libgl1-mesa-dev libfreeimage-dev
sudo apt-get install rapidjson-dev libdraco-dev
Building is possible with C++ compliant compiler: Building is possible with C++ compliant compiler: