From aa72516fbe192c1f991cf4d838ada2a98838d25b Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Mon, 1 Oct 2012 13:16:07 +0200
Subject: [PATCH] Use variable OCC_OCAF_LIBRARIES for OCAF libs

---
 cMake/UseLibPack6x.cmake          | 11 ++++++--
 cMake/UseLibPack7x.cmake          | 11 ++++++--
 cMake/UseLibPack8x.cmake          | 20 +++++++-------
 cMake/UseLibPackCustom.cmake      | 43 +++++++++++++++++++++++++++++--
 src/Mod/Import/Gui/CMakeLists.txt |  6 +----
 5 files changed, 70 insertions(+), 21 deletions(-)

diff --git a/cMake/UseLibPack6x.cmake b/cMake/UseLibPack6x.cmake
index 738404e4c..ef6bc2011 100644
--- a/cMake/UseLibPack6x.cmake
+++ b/cMake/UseLibPack6x.cmake
@@ -277,6 +277,9 @@ set(ODE_FOUND TRUE)
 
 # OCC
 set(OCC_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/OpenCascade)
+set(OCC_LIBRARY_DIR
+    ${FREECAD_LIBPACK_DIR}/lib
+)
 set(OCC_LIBRARIES
     TKFillet
     TKMesh
@@ -302,7 +305,11 @@ set(OCC_LIBRARIES
     TKHLR
     TKFeat
 )
-set(OCC_LIBRARY_DIR
-    ${FREECAD_LIBPACK_DIR}/lib
+set(OCC_OCAF_LIBRARIES
+    TKCAF
+    TKXCAF
+    TKLCAF
+    TKXDESTEP
+    TKXDEIGES
 )
 set(OCC_FOUND TRUE) 
diff --git a/cMake/UseLibPack7x.cmake b/cMake/UseLibPack7x.cmake
index b74fc595c..6063ef3b3 100644
--- a/cMake/UseLibPack7x.cmake
+++ b/cMake/UseLibPack7x.cmake
@@ -283,6 +283,9 @@ set(OPENCV_FOUND TRUE)
 
 # OCC
 set(OCC_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/OpenCascade)
+set(OCC_LIBRARY_DIR
+    ${FREECAD_LIBPACK_DIR}/lib
+)
 set(OCC_LIBRARIES
     TKFillet
     TKMesh
@@ -308,8 +311,12 @@ set(OCC_LIBRARIES
     TKHLR
     TKFeat
 )
-set(OCC_LIBRARY_DIR
-    ${FREECAD_LIBPACK_DIR}/lib
+set(OCC_OCAF_LIBRARIES
+    TKCAF
+    TKXCAF
+    TKLCAF
+    TKXDESTEP
+    TKXDEIGES
 )
 set(OCC_FOUND TRUE) 
 
diff --git a/cMake/UseLibPack8x.cmake b/cMake/UseLibPack8x.cmake
index f77a3afcd..ab34a2c5c 100644
--- a/cMake/UseLibPack8x.cmake
+++ b/cMake/UseLibPack8x.cmake
@@ -283,6 +283,9 @@ set(OPENCV_FOUND TRUE)
 
 # OCC
 set(OCC_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/OpenCascade)
+set(OCC_LIBRARY_DIR
+    ${FREECAD_LIBPACK_DIR}/lib
+)
 set(OCC_LIBRARIES
     TKFillet
     TKMesh
@@ -295,14 +298,7 @@ set(OCC_LIBRARIES
     TKShHealing
     TKXSBase
     TKBool
-	TKXSBase 
-	TKXCAF 
-	TKLCAF 
-	TKCAF 
-	TKSTEP 
-	TKIGES 
-	TKXDESTEP 
-	TKXDEIGES 
+    TKXSBase 
     TKBO
     TKBRep
     TKTopAlgo
@@ -316,8 +312,12 @@ set(OCC_LIBRARIES
     TKHLR
     TKFeat
 )
-set(OCC_LIBRARY_DIR
-    ${FREECAD_LIBPACK_DIR}/lib
+set(OCC_OCAF_LIBRARIES
+    TKCAF
+    TKXCAF
+    TKLCAF
+    TKXDESTEP
+    TKXDEIGES
 )
 set(OCC_FOUND TRUE) 
 
diff --git a/cMake/UseLibPackCustom.cmake b/cMake/UseLibPackCustom.cmake
index 48fede470..fefcf7ef4 100644
--- a/cMake/UseLibPackCustom.cmake
+++ b/cMake/UseLibPackCustom.cmake
@@ -305,7 +305,42 @@ set(OPENCV_LIBRARIES  cv.lib cvaux.lib cxcore.lib cxts.lib highgui.lib)
 set(OPENCV_FOUND TRUE) 
 
 # OCC
+#set(OCC_INCLUDE_DIR C:/Projects/LibPack/oce-0.10.0/include/oce)
+#set(OCC_LIBRARY_DIR C:/Projects/LibPack/oce-0.10.0/Win64/lib)
+#set(OCC_LIBRARIES
+#    ${OCC_LIBRARY_DIR}/TKFillet.lib
+#    ${OCC_LIBRARY_DIR}/TKMesh.lib
+#    ${OCC_LIBRARY_DIR}/TKernel.lib
+#    ${OCC_LIBRARY_DIR}/TKG2d.lib
+#    ${OCC_LIBRARY_DIR}/TKG3d.lib
+#    ${OCC_LIBRARY_DIR}/TKMath.lib
+#    ${OCC_LIBRARY_DIR}/TKIGES.lib
+#    ${OCC_LIBRARY_DIR}/TKSTL.lib
+#    ${OCC_LIBRARY_DIR}/TKShHealing.lib
+#    ${OCC_LIBRARY_DIR}/TKXSBase.lib
+#    ${OCC_LIBRARY_DIR}/TKBool.lib
+#    ${OCC_LIBRARY_DIR}/TKBO.lib
+#    ${OCC_LIBRARY_DIR}/TKBRep.lib
+#    ${OCC_LIBRARY_DIR}/TKTopAlgo.lib
+#    ${OCC_LIBRARY_DIR}/TKGeomAlgo.lib
+#    ${OCC_LIBRARY_DIR}/TKGeomBase.lib
+#    ${OCC_LIBRARY_DIR}/TKOffset.lib
+#    ${OCC_LIBRARY_DIR}/TKPrim.lib
+#    ${OCC_LIBRARY_DIR}/TKSTEP.lib
+#    ${OCC_LIBRARY_DIR}/TKSTEPBase.lib
+#    ${OCC_LIBRARY_DIR}/TKSTEPAttr.lib
+#    ${OCC_LIBRARY_DIR}/TKHLR.lib
+#    ${OCC_LIBRARY_DIR}/TKFeat.lib
+#)
+#set(OCC_OCAF_LIBRARIES
+#    ${OCC_LIBRARY_DIR}/TKCAF.lib
+#    ${OCC_LIBRARY_DIR}/TKXCAF.lib
+#    ${OCC_LIBRARY_DIR}/TKLCAF.lib
+#    ${OCC_LIBRARY_DIR}/TKXDESTEP.lib
+#    ${OCC_LIBRARY_DIR}/TKXDEIGES.lib
+#)
 set(OCC_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/OpenCascade-6.3.0)
+set(OCC_LIBRARY_DIR ${FREECAD_LIBPACK_DIR}/lib)
 set(OCC_LIBRARIES
     TKFillet
     TKMesh
@@ -331,8 +366,12 @@ set(OCC_LIBRARIES
     TKHLR
     TKFeat
 )
-set(OCC_LIBRARY_DIR
-    ${FREECAD_LIBPACK_DIR}/lib
+set(OCC_OCAF_LIBRARIES
+    TKCAF
+    TKXCAF
+    TKLCAF
+    TKXDESTEP
+    TKXDEIGES
 )
 set(OCC_FOUND TRUE) 
 
diff --git a/src/Mod/Import/Gui/CMakeLists.txt b/src/Mod/Import/Gui/CMakeLists.txt
index d5029eca8..ed588fd9c 100644
--- a/src/Mod/Import/Gui/CMakeLists.txt
+++ b/src/Mod/Import/Gui/CMakeLists.txt
@@ -22,11 +22,7 @@ link_directories(${OCC_LIBRARY_DIR})
 set(ImportGui_LIBS
     FreeCADGui
     PartGui
-    TKCAF
-    TKXCAF
-    TKLCAF
-    TKXDESTEP
-    TKXDEIGES
+    ${OCC_OCAF_LIBRARIES}
 )
 
 SET(ImportGui_SRCS