From 6f907c3b48627eff12af8e4c9d394f0e053c5539 Mon Sep 17 00:00:00 2001
From: jriegel <FreeCAD@juergen-riegel.net>
Date: Sat, 15 Nov 2014 21:18:22 +0100
Subject: [PATCH] some fixes in build with CL-Bundler

---
 CMakeLists.txt          | 12 ++++++------
 src/Base/CMakeLists.txt |  6 +++---
 src/Doc/CMakeLists.txt  |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fcea767f8..f82c4413d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -356,10 +356,10 @@ if(FREECAD_LIBPACK_USE)
     ELSEIF(FREECAD_LIBPACK_CHECKCUSTOM)
         set(FREECAD_LIBPACK_VERSION "Custom" CACHE STRING "Displays if the libpack has been found" FORCE)
         include(cMake/UseLibPackCustom.cmake)
-    ELSE(FREECAD_LIBPACK_CHECKFILE6X)
+    ELSE(FREECAD_LIBPACK_CHECKFILE_CLBUNDLER)
         set(FREECAD_LIBPACK_VERSION "NOTFOUND" CACHE STRING "Displays if the libpack has been found" FORCE)
         message(SEND_ERROR  "Could not find libpack in specified location:" ${FREECAD_LIBPACK_DIR})
-    ENDIF(FREECAD_LIBPACK_CHECKFILE6X)
+    ENDIF(FREECAD_LIBPACK_CHECKFILE_CLBUNDLER)
 
 # -------------------------------- PyCXX --------------------------------
 
@@ -442,7 +442,7 @@ if(NOT FREECAD_LIBPACK_USE OR FREECAD_LIBPACK_CHECKFILE_CLBUNDLER)
     endif()
     find_package (OCE QUIET)
     if(${OCE_FOUND})
-        message("-- OpenCASCADE Community Edition has been found.")
+        message(STATUS "-- OpenCASCADE Community Edition has been found.")
         #lib list copied from FreeCAD's FindOpenCasCade.cmake
         set(OCC_LIBRARIES
             TKFillet
@@ -494,8 +494,8 @@ if(NOT FREECAD_LIBPACK_USE OR FREECAD_LIBPACK_CHECKFILE_CLBUNDLER)
         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}")
+            message(STATUS "-- OpenCASCADE include directory: ${OCC_INCLUDE_PATH}")
+            message(STATUS "-- OpenCASCADE shared libraries directory: ${OCC_LIB_PATH}")
         endif()
     endif()
 
@@ -649,7 +649,7 @@ if(NOT FREECAD_LIBPACK_USE OR FREECAD_LIBPACK_CHECKFILE_CLBUNDLER)
 
         find_package(Matplotlib)
         IF(MATPLOTLIB_FOUND)
-            message("-- matplotlib-${MATPLOTLIB_VERSION} has been found.")
+            message(STATUS "-- matplotlib-${MATPLOTLIB_VERSION} has been found.")
         ELSE(MATPLOTLIB_FOUND)
             message("-- matplotlib not found, Plot module won't be available!")
         ENDIF(MATPLOTLIB_FOUND)
diff --git a/src/Base/CMakeLists.txt b/src/Base/CMakeLists.txt
index 8f5bad43e..4087287bd 100644
--- a/src/Base/CMakeLists.txt
+++ b/src/Base/CMakeLists.txt
@@ -21,10 +21,10 @@ if(MSVC)
     set(FreeCADBase_LIBS
         ${Boost_LIBRARIES}
         ${Boost_DEBUG_LIBRARIES}
-        ${PYTHON_DEBUG_LIBRARY}
+        debug ${PYTHON_DEBUG_LIBRARY}
         ${PYTHON_LIBRARY}
-        ${XERCESC_DEBUG_LIBRARIES}
-        ${XERCESC_LIBRARIES}
+        debug ${XERCESC_DEBUG_LIBRARIES}
+        optimized ${XERCESC_LIBRARIES}
         ${QT_QTCORE_LIBRARY}
         ${ZLIB_LIBRARIES}
         debug MSVCRTD.LIB
diff --git a/src/Doc/CMakeLists.txt b/src/Doc/CMakeLists.txt
index a3dec2a45..e197e2831 100644
--- a/src/Doc/CMakeLists.txt
+++ b/src/Doc/CMakeLists.txt
@@ -4,7 +4,7 @@ if(DOXYGEN_FOUND)
     IF (DOXYGEN_DOT_EXECUTABLE)
         SET(HAVE_DOT YES)
     ELSE (DOXYGEN_DOT_EXECUTABLE)
-        message("Note: Doxygen docs will look better with graphviz's dot installed.")
+        message(STATUS "Note: Doxygen docs will look better with graphviz's dot installed.")
         SET(HAVE_DOT NO)
     ENDIF (DOXYGEN_DOT_EXECUTABLE)