Fix duplicate 'optimized' when using new libpack

When using a CLbundler libpack, PYTHON_LIBRARY has both optimized and debug libs, but it doesn't when using an old libpack, which was the reason for commit f5a4e68
FreeCAD · Dec 29, 2014 · 32dd867 · 32dd867
1 parent 6a1cb47
commit 32dd867
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/cMake/UseLibPack10x.cmake b/cMake/UseLibPack10x.cmake
@@ -11,11 +11,10 @@ include_directories(${FREECAD_LIBPACK_DIR}/include)
 set(OPENGL_gl_LIBRARY opengl32 glu32)
 
 # Python
-set(PYTHON_DEBUG_LIBRARY python27_d.lib)
-set(PYTHON_LIBRARY python27.lib)
+set(PYTHON_LIBRARY optimized python27.lib debug python27_d.lib)
 set(PYTHON_INCLUDE_PATH ${FREECAD_LIBPACK_DIR}/include/Python-2.7.5)
 set(PYTHON_EXECUTABLE   ${FREECAD_LIBPACK_DIR}/bin/python.exe)
-set(PYTHONLIBS_FOUND TRUE) 
+set(PYTHONLIBS_FOUND TRUE)
 
 # XercesC
 set(XERCESC_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/xerces-c-3.1.1)

diff --git a/cMake/UseLibPack9x.cmake b/cMake/UseLibPack9x.cmake
@@ -11,8 +11,7 @@ include_directories(${FREECAD_LIBPACK_DIR}/include)
 set(OPENGL_gl_LIBRARY opengl32 glu32)
 
 # Python
-set(PYTHON_DEBUG_LIBRARY python27_d.lib)
-set(PYTHON_LIBRARY python27.lib)
+set(PYTHON_LIBRARY optimized python27.lib debug python27_d.lib)
 set(PYTHON_INCLUDE_PATH ${FREECAD_LIBPACK_DIR}/include/Python-2.7.6)
 set(PYTHON_EXECUTABLE   ${FREECAD_LIBPACK_DIR}/bin/python.exe)
 set(PYTHONLIBS_FOUND TRUE) 

diff --git a/src/3rdParty/Pivy-0.5/CMakeLists.txt b/src/3rdParty/Pivy-0.5/CMakeLists.txt
@@ -27,8 +27,7 @@ if(MSVC)
         Rpcrt4.lib
         debug ${COIN3D_LIBRARY_DEBUG}
         optimized ${COIN3D_LIBRARY_RELEASE}
-        debug ${PYTHON_DEBUG_LIBRARY}
-        optimized ${PYTHON_LIBRARY})
+        ${PYTHON_LIBRARY})
 else(MSVC)
     set(CoinPy_LIBS
         ${COIN3D_LIBRARY}

diff --git a/src/Base/CMakeLists.txt b/src/Base/CMakeLists.txt
@@ -21,8 +21,7 @@ if(MSVC)
     set(FreeCADBase_LIBS
         ${Boost_LIBRARIES}
         ${Boost_DEBUG_LIBRARIES}
-        debug ${PYTHON_DEBUG_LIBRARY}
-        optimized ${PYTHON_LIBRARY}
+        ${PYTHON_LIBRARY}
         debug ${XERCESC_DEBUG_LIBRARIES}
         optimized ${XERCESC_LIBRARIES}
         ${QT_QTCORE_LIBRARY}