Add support for CLbundler created LibPack

* New 'UseLibPack' cmake file sets CMAKE_PREFIX_PATH so that find_package
  can be used for most packages.
* Mimic fc_wrap_cpp defined in other 'UseLibPack' files. Some file
  dependencies did not get set correctly otherwise.
* OCE 0.16 does not have Standard_ctype.hxx
* shfolder.h can't be used with Win SDK 7.0

src/3rdParty/salomesmesh/CMakeLists.txt

@@ -9,6 +9,13 @@ SET(SMESH_VERSION_TWEAK 2)
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
 include_directories(
+    inc
+    src/SMDS
+    src/Driver
+    src/DriverUNV
+    src/DriverDAT
+    src/DriverSTL
+    src/StdMeshers
     ${CMAKE_BINARY_DIR}/src
     ${CMAKE_SOURCE_DIR}/src
     ${CMAKE_CURRENT_BINARY_DIR}
@@ -16,13 +23,6 @@ include_directories(
     ${OCC_INCLUDE_DIR}
     ${NGLIB_INCLUDE_DIR}
     ${NETGEN_INCLUDE_DIRS}
-    src/SMDS
-    src/Driver
-    src/DriverUNV
-    src/DriverDAT
-    src/DriverSTL
-    src/StdMeshers
-    inc
 )
 link_directories(${OCC_LIBRARY_DIR})
 

src/App/Application.cpp

@@ -45,10 +45,6 @@
 
 #ifdef FC_OS_WIN32
 # include <Shlobj.h>
-// Doesn't seem to work with VS2010
-# if (defined(_MSC_VER) && (_MSC_VER < 1600))
-# include <Shfolder.h>
-# endif
 #endif
 
 

src/Base/CMakeLists.txt

@@ -26,7 +26,6 @@ if(MSVC)
         debug ${XERCESC_DEBUG_LIBRARIES}
         optimized ${XERCESC_LIBRARIES}
         ${QT_QTCORE_LIBRARY}
-        ${QT_QTCORE_LIBRARY_DEBUG}
         ${ZLIB_LIBRARIES}
         debug MSVCRTD.LIB
         debug MSVCPRTD.LIB

src/Mod/Drawing/App/PreCompiled.h

@@ -114,7 +114,7 @@
 #include <Standard_Underflow.hxx>
 #include <Standard_UUID.hxx>
 #include <Standard_WayOfLife.hxx>
-#if OCC_VERSION_HEX < 0x060800
+#if OCC_VERSION_HEX < 0x060700
 #include <Standard_ctype.hxx>
 #include <Standard_OId.hxx>
 #endif

src/Mod/Mesh/App/CMakeLists.txt

@@ -20,7 +20,6 @@ include_directories(
 set(Mesh_LIBS
     ${Boost_LIBRARIES}
     ${QT_QTCORE_LIBRARY}
-    ${QT_QTCORE_LIBRARY_DEBUG}
     FreeCADBase
     FreeCADApp
 )

src/Mod/Robot/App/CMakeLists.txt

@@ -20,20 +20,11 @@ include_directories(
 )
 link_directories(${OCC_LIBRARY_DIR})
 
-if(MSVC)
-    set(Robot_LIBS
-        Part
-        ${QT_QTCORE_LIBRARY}
-        ${QT_QTCORE_LIBRARY_DEBUG}
-        FreeCADApp
-    )
-else(MSVC)
-    set(Robot_LIBS
-        Part
-        ${QT_QTCORE_LIBRARY}
-        FreeCADApp
-    )
-endif(MSVC)
+set(Robot_LIBS
+    Part
+    ${QT_QTCORE_LIBRARY}
+    FreeCADApp
+)
 
 FILE( GLOB KDL_SRCS kdl_cp/[^.]*.cpp )
 FILE( GLOB KDL_HPPS kdl_cp/[^.]*.hpp kdl_cp/[^.]*.inl)