Merge remote-tracking branch 'refs/remotes/peterl94-github/new-libpack' into review-CL-Bundler

2014-11-15 13:07:23 +01:00
parent 18c0b3ba69 f13f5dc520
commit f4fc7e88fa
12 changed files with 126 additions and 49 deletions
--- a/src/Mod/Drawing/App/PreCompiled.h
+++ b/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
--- a/src/Mod/Mesh/App/CMakeLists.txt
+++ b/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
 )
--- a/src/Mod/Robot/App/CMakeLists.txt
+++ b/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)