kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Fix build problems with ImportGui module, fix bug in Draft when using texture image

Browse Source
This commit is contained in:
wmayer
2012-10-05 12:19:07 +02:00
parent bbd8450894
commit db08d87e99
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -212,6 +212,7 @@ MARK_AS_ADVANCED(FORCE FREECAD_LIBPACK_CHECKFILE6X FREECAD_LIBPACK_CHECKFILE7X)
message("-- OpenCASCADE Community Edition has been found.") message("-- OpenCASCADE Community Edition has been found.")
add_definitions ( -DHAVE_CONFIG_H ) 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_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" ) #lib list copied from FreeCAD's FindOpenCasCade.cmake
set( OCC_INCLUDE_DIR ${OCE_INCLUDE_DIRS} ) set( OCC_INCLUDE_DIR ${OCE_INCLUDE_DIRS} )
set( OCC_FOUND ${OCE_FOUND} ) set( OCC_FOUND ${OCE_FOUND} )
else() #look for OpenCASCADE else() #look for OpenCASCADE

19
cMake/FindOpenCasCade.cmake
View File

@@ -1,12 +1,12 @@
# Try to find OCC # Try to find OCC
# Once done this will define # Once done this will define
# #
# OCC_FOUND - system has OCC - OpenCASCADE # OCC_FOUND - system has OCC - OpenCASCADE
# OCC_INCLUDE_DIR - where the OCC include directory can be found # OCC_INCLUDE_DIR - where the OCC include directory can be found
# OCC_LIBRARY_DIR - where the OCC library directory can be found # OCC_LIBRARY_DIR - where the OCC library directory can be found
# OCC_LIBRARIES - Link this to use OCC # OCC_LIBRARIES - Link this to use OCC
# # OCC_OCAF_LIBRARIES - Link this to use OCC OCAF framework
IF (WIN32) IF (WIN32)
IF (CYGWIN OR MINGW) IF (CYGWIN OR MINGW)
@@ -80,5 +80,12 @@ IF(OCC_LIBRARY)
TKHLR TKHLR
TKFeat TKFeat
) )
set(OCC_OCAF_LIBRARIES
TKCAF
TKXCAF
TKLCAF
TKXDESTEP
TKXDEIGES
)
ENDIF(OCC_LIBRARY) ENDIF(OCC_LIBRARY)

1
src/Mod/Draft/Draft.py
View File

@@ -2402,6 +2402,7 @@ class _ViewProviderRectangle(_ViewProviderDraft):
self.Object = vobj.Object self.Object = vobj.Object
def onChanged(self, vp, prop): def onChanged(self, vp, prop):
from pivy import coin
if prop == "TextureImage": if prop == "TextureImage":
r = vp.RootNode r = vp.RootNode
if os.path.exists(vp.TextureImage): if os.path.exists(vp.TextureImage):