suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix duplicate 'optimized' when using new libpack

Browse Source 
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
This commit is contained in:
Peter Lama 2014-12-18 14:32:32 -08:00
parent 6a1cb47e30
commit 32dd867a30
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cMake/UseLibPack10x.cmake
View File

@ -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)

3
cMake/UseLibPack9x.cmake
View File

@ -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)

3
src/3rdParty/Pivy-0.5/CMakeLists.txt vendored
View File

@ -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}

3
src/Base/CMakeLists.txt
View File

@ -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}