diff --git a/cMake/UseLibPack10x.cmake b/cMake/UseLibPack10x.cmake index a3c6665ff8..24d1489c99 100644 --- a/cMake/UseLibPack10x.cmake +++ b/cMake/UseLibPack10x.cmake @@ -11,7 +11,7 @@ include_directories(${FREECAD_LIBPACK_DIR}/include) set(OPENGL_gl_LIBRARY opengl32 glu32) # Python -set(PYTHON_LIBRARY optimized python27.lib debug python27_d.lib) +set(PYTHON_LIBRARIES 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) diff --git a/cMake/UseLibPack6x.cmake b/cMake/UseLibPack6x.cmake index 18a8e43e1e..db0369aa45 100644 --- a/cMake/UseLibPack6x.cmake +++ b/cMake/UseLibPack6x.cmake @@ -11,8 +11,7 @@ include_directories(${FREECAD_LIBPACK_DIR}/include) set(OPENGL_gl_LIBRARY opengl32 glu32) # Python -set(PYTHON_DEBUG_LIBRARY python25_d.lib) -set(PYTHON_LIBRARY python25.lib) +set(PYTHON_LIBRARIES optimized python25.lib debug python25_d.lib) set(PYTHON_INCLUDE_PATH ${FREECAD_LIBPACK_DIR}/include/python) set(PYTHON_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/python.exe) set(PYTHONLIBS_FOUND TRUE) diff --git a/cMake/UseLibPack7x.cmake b/cMake/UseLibPack7x.cmake index 1521038274..db4feba89f 100644 --- a/cMake/UseLibPack7x.cmake +++ b/cMake/UseLibPack7x.cmake @@ -11,8 +11,7 @@ include_directories(${FREECAD_LIBPACK_DIR}/include) set(OPENGL_gl_LIBRARY opengl32 glu32) # Python -set(PYTHON_DEBUG_LIBRARY python26_d.lib) -set(PYTHON_LIBRARY python26.lib) +set(PYTHON_LIBRARIES optimized python26.lib debug python26_d.lib) set(PYTHON_INCLUDE_PATH ${FREECAD_LIBPACK_DIR}/include/python) set(PYTHON_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/python.exe) set(PYTHONLIBS_FOUND TRUE) diff --git a/cMake/UseLibPack8x.cmake b/cMake/UseLibPack8x.cmake index 3a30a0d02b..8004645e56 100644 --- a/cMake/UseLibPack8x.cmake +++ b/cMake/UseLibPack8x.cmake @@ -11,8 +11,7 @@ include_directories(${FREECAD_LIBPACK_DIR}/include) set(OPENGL_gl_LIBRARY opengl32 glu32) # Python -set(PYTHON_DEBUG_LIBRARY python26_d.lib) -set(PYTHON_LIBRARY python26.lib) +set(PYTHON_LIBRARIES optimized python26.lib debug python26_d.lib) set(PYTHON_INCLUDE_PATH ${FREECAD_LIBPACK_DIR}/include/python) set(PYTHON_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/python.exe) set(PYTHONLIBS_FOUND TRUE) diff --git a/cMake/UseLibPack9x.cmake b/cMake/UseLibPack9x.cmake index ff6e4a6bd1..851f26bc43 100644 --- a/cMake/UseLibPack9x.cmake +++ b/cMake/UseLibPack9x.cmake @@ -11,7 +11,7 @@ include_directories(${FREECAD_LIBPACK_DIR}/include) set(OPENGL_gl_LIBRARY opengl32 glu32) # Python -set(PYTHON_LIBRARY optimized python27.lib debug python27_d.lib) +set(PYTHON_LIBRARIES 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/cMake/UseLibPackCustom.cmake b/cMake/UseLibPackCustom.cmake index c3d8813246..3df86d8ceb 100644 --- a/cMake/UseLibPackCustom.cmake +++ b/cMake/UseLibPackCustom.cmake @@ -11,8 +11,7 @@ include_directories(${FREECAD_LIBPACK_DIR}/include) set(OPENGL_gl_LIBRARY opengl32 glu32) # Python -set(PYTHON_DEBUG_LIBRARY python26_d.lib) -set(PYTHON_LIBRARY python26.lib) +set(PYTHON_LIBRARIES optimized python26.lib debug python26_d.lib) set(PYTHON_INCLUDE_PATH ${FREECAD_LIBPACK_DIR}/include/Python-2.6.4) set(PYTHON_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/python.exe) set(PYTHONLIBS_FOUND TRUE) diff --git a/src/Base/CMakeLists.txt b/src/Base/CMakeLists.txt index 314b87d95a..7592449f3b 100644 --- a/src/Base/CMakeLists.txt +++ b/src/Base/CMakeLists.txt @@ -21,7 +21,7 @@ if(MSVC) set(FreeCADBase_LIBS ${Boost_LIBRARIES} ${Boost_DEBUG_LIBRARIES} - ${PYTHON_LIBRARY} + ${PYTHON_LIBRARIES} debug ${XERCESC_DEBUG_LIBRARIES} optimized ${XERCESC_LIBRARIES} ${QT_QTCORE_LIBRARY} @@ -35,7 +35,7 @@ if(MSVC) ) elseif(MINGW) set(FreeCADBase_LIBS - ${PYTHON_LIBRARY} + ${PYTHON_LIBRARIES} ${XERCESC_LIBRARIES} ${QT_QTCORE_LIBRARY} ${Boost_LIBRARIES} @@ -44,7 +44,7 @@ elseif(MINGW) ) else(MSVC) set(FreeCADBase_LIBS - ${PYTHON_LIBRARY} + ${PYTHON_LIBRARIES} ${XERCESC_LIBRARIES} ${QT_QTCORE_LIBRARY} ${Boost_LIBRARIES}