From 32dd867a304909fd22fa1730dca5969c9fdfe221 Mon Sep 17 00:00:00 2001 From: Peter Lama Date: Thu, 18 Dec 2014 14:32:32 -0800 Subject: [PATCH] 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 f5a4e680 --- cMake/UseLibPack10x.cmake | 5 ++--- cMake/UseLibPack9x.cmake | 3 +-- src/3rdParty/Pivy-0.5/CMakeLists.txt | 3 +-- src/Base/CMakeLists.txt | 3 +-- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/cMake/UseLibPack10x.cmake b/cMake/UseLibPack10x.cmake index 7a2f4c014..36a436aa1 100644 --- 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 index 99c540d59..e2f46f8b1 100644 --- 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 index 6abda6bbe..b580b10de 100644 --- 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 index 5c41eb417..314b87d95 100644 --- 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}