0001026: Suppress CMake warning if OCE wasn't found but OCC was found
This commit is contained in:
parent
449e71a6b4
commit
75755c62a4
|
@ -209,30 +209,64 @@ MARK_AS_ADVANCED(FORCE FREECAD_LIBPACK_CHECKFILE6X FREECAD_LIBPACK_CHECKFILE7X)
|
|||
#first, look for OpenCASCADE Community Edition (OCE)
|
||||
#if OCE is installed in a nonstandard location, add -DOCE_DIR=/path/to/dir/containing/OCEConfig.cmake
|
||||
# when configuring with cmake, i.e. cmake .. -DOCE_DIR=/usr/share/cmake
|
||||
if( NOT DEFINED OCE_DIR )
|
||||
if( UNIX )
|
||||
set( OCE_DIR "/usr/local/share/cmake/" )
|
||||
else()
|
||||
set( OCE_DIR "c:/OCE-0.4.0/share/cmake" )
|
||||
endif()
|
||||
endif()
|
||||
find_package ( OCE )
|
||||
if( ${OCE_FOUND} )
|
||||
message("-- OpenCASCADE Community Edition has been found.")
|
||||
add_definitions ( -DHAVE_CONFIG_H )
|
||||
set( OCC_LIBRARIES "TKFeat;TKFillet;TKMesh;TKernel;TKG2d;TKG3d;TKMath;TKIGES;TKSTL;TKShHealing;TKXSBase;TKBool;TKBO;TKBRep;TKTopAlgo;TKGeomAlgo;TKGeomBase;TKOffset;TKPrim;TKSTEP;TKSTEPBase;TKSTEPAttr;TKHLR" ) #lib list copied from FreeCAD's FindOpenCasCade.cmake
|
||||
set( OCC_OCAF_LIBRARIES "TKCAF;TKXCAF;TKLCAF;TKXDESTEP;TKXDEIGES;TKMeshVS;TKAdvTools" ) #lib list copied from FreeCAD's FindOpenCasCade.cmake
|
||||
set( OCC_INCLUDE_DIR ${OCE_INCLUDE_DIRS} )
|
||||
set( OCC_FOUND ${OCE_FOUND} )
|
||||
else() #look for OpenCASCADE
|
||||
find_package(OpenCasCade)
|
||||
IF(NOT OCC_FOUND)
|
||||
MESSAGE("Neither OpenCASCADE Community Edition nor OpenCasCade were found: will not build CAD modules!")
|
||||
ELSE()
|
||||
MESSAGE("-- OpenCASCADE include directory: ${OCC_INCLUDE_PATH}")
|
||||
MESSAGE("-- OpenCASCADE shared libraries directory: ${OCC_LIB_PATH}")
|
||||
ENDIF()
|
||||
endif()
|
||||
if(NOT DEFINED OCE_DIR)
|
||||
if(UNIX)
|
||||
set(OCE_DIR "/usr/local/share/cmake/")
|
||||
elif(WIN32)
|
||||
set(OCE_DIR "c:/OCE-0.4.0/share/cmake")
|
||||
endif()
|
||||
endif()
|
||||
find_package (OCE QUIET)
|
||||
if(${OCE_FOUND})
|
||||
message("-- OpenCASCADE Community Edition has been found.")
|
||||
add_definitions (-DHAVE_CONFIG_H)
|
||||
#lib list copied from FreeCAD's FindOpenCasCade.cmake
|
||||
set(OCC_LIBRARIES
|
||||
TKFillet
|
||||
TKMesh
|
||||
TKernel
|
||||
TKG2d
|
||||
TKG3d
|
||||
TKMath
|
||||
TKIGES
|
||||
TKSTL
|
||||
TKShHealing
|
||||
TKXSBase
|
||||
TKBool
|
||||
TKBO
|
||||
TKBRep
|
||||
TKTopAlgo
|
||||
TKGeomAlgo
|
||||
TKGeomBase
|
||||
TKOffset
|
||||
TKPrim
|
||||
TKSTEP
|
||||
TKSTEPBase
|
||||
TKSTEPAttr
|
||||
TKHLR
|
||||
TKFeat
|
||||
)
|
||||
#lib list copied from FreeCAD's FindOpenCasCade.cmake
|
||||
set(OCC_OCAF_LIBRARIES
|
||||
TKCAF
|
||||
TKXCAF
|
||||
TKLCAF
|
||||
TKXDESTEP
|
||||
TKXDEIGES
|
||||
TKMeshVS
|
||||
TKAdvTools
|
||||
)
|
||||
set(OCC_INCLUDE_DIR ${OCE_INCLUDE_DIRS})
|
||||
set(OCC_FOUND ${OCE_FOUND})
|
||||
else() #look for OpenCASCADE
|
||||
find_package(OpenCasCade)
|
||||
if(NOT OCC_FOUND)
|
||||
message("Neither OpenCASCADE Community Edition nor OpenCasCade were found: will not build CAD modules!")
|
||||
else()
|
||||
message("-- OpenCASCADE include directory: ${OCC_INCLUDE_PATH}")
|
||||
message("-- OpenCASCADE shared libraries directory: ${OCC_LIB_PATH}")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
# -------------------------------- Salome SMESH --------------------------
|
||||
|
||||
|
@ -364,11 +398,11 @@ MARK_AS_ADVANCED(FORCE FREECAD_LIBPACK_CHECKFILE6X FREECAD_LIBPACK_CHECKFILE7X)
|
|||
|
||||
# -------------------------------- Shiboken/PySide ------------------------
|
||||
|
||||
find_package(Shiboken)
|
||||
find_package(Shiboken QUIET)
|
||||
IF(SHIBOKEN_INCLUDE_DIR)
|
||||
message("-- Shiboken has been found.")
|
||||
ENDIF(SHIBOKEN_INCLUDE_DIR)
|
||||
find_package(PySide)
|
||||
find_package(PySide QUIET)
|
||||
IF(PYSIDE_INCLUDE_DIR)
|
||||
message("-- PySide has been found.")
|
||||
ENDIF(PYSIDE_INCLUDE_DIR)
|
||||
|
|
Loading…
Reference in New Issue
Block a user