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

+ replace PYTHON_LIBRARY with correct variable PYTHON_LIBRARIES

Browse Source
This commit is contained in:
wmayer 2015-07-16 19:29:56 +02:00
parent 0b1da87302
commit 40cd060c5b
7 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cMake/UseLibPack10x.cmake
View File

@ -11,7 +11,7 @@ include_directories(${FREECAD_LIBPACK_DIR}/include)
set(OPENGL_gl_LIBRARY opengl32 glu32) set(OPENGL_gl_LIBRARY opengl32 glu32)
# Python # 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_INCLUDE_PATH ${FREECAD_LIBPACK_DIR}/include/Python-2.7.5)
set(PYTHON_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/python.exe) set(PYTHON_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/python.exe)
set(PYTHONLIBS_FOUND TRUE) set(PYTHONLIBS_FOUND TRUE)

3
cMake/UseLibPack6x.cmake
View File

@ -11,8 +11,7 @@ include_directories(${FREECAD_LIBPACK_DIR}/include)
set(OPENGL_gl_LIBRARY opengl32 glu32) set(OPENGL_gl_LIBRARY opengl32 glu32)
# Python # Python
set(PYTHON_DEBUG_LIBRARY python25_d.lib) set(PYTHON_LIBRARIES optimized python25.lib debug python25_d.lib)
set(PYTHON_LIBRARY python25.lib)
set(PYTHON_INCLUDE_PATH ${FREECAD_LIBPACK_DIR}/include/python) set(PYTHON_INCLUDE_PATH ${FREECAD_LIBPACK_DIR}/include/python)
set(PYTHON_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/python.exe) set(PYTHON_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/python.exe)
set(PYTHONLIBS_FOUND TRUE) set(PYTHONLIBS_FOUND TRUE)

3
cMake/UseLibPack7x.cmake
View File

@ -11,8 +11,7 @@ include_directories(${FREECAD_LIBPACK_DIR}/include)
set(OPENGL_gl_LIBRARY opengl32 glu32) set(OPENGL_gl_LIBRARY opengl32 glu32)
# Python # Python
set(PYTHON_DEBUG_LIBRARY python26_d.lib) set(PYTHON_LIBRARIES optimized python26.lib debug python26_d.lib)
set(PYTHON_LIBRARY python26.lib)
set(PYTHON_INCLUDE_PATH ${FREECAD_LIBPACK_DIR}/include/python) set(PYTHON_INCLUDE_PATH ${FREECAD_LIBPACK_DIR}/include/python)
set(PYTHON_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/python.exe) set(PYTHON_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/python.exe)
set(PYTHONLIBS_FOUND TRUE) set(PYTHONLIBS_FOUND TRUE)

3
cMake/UseLibPack8x.cmake
View File

@ -11,8 +11,7 @@ include_directories(${FREECAD_LIBPACK_DIR}/include)
set(OPENGL_gl_LIBRARY opengl32 glu32) set(OPENGL_gl_LIBRARY opengl32 glu32)
# Python # Python
set(PYTHON_DEBUG_LIBRARY python26_d.lib) set(PYTHON_LIBRARIES optimized python26.lib debug python26_d.lib)
set(PYTHON_LIBRARY python26.lib)
set(PYTHON_INCLUDE_PATH ${FREECAD_LIBPACK_DIR}/include/python) set(PYTHON_INCLUDE_PATH ${FREECAD_LIBPACK_DIR}/include/python)
set(PYTHON_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/python.exe) set(PYTHON_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/python.exe)
set(PYTHONLIBS_FOUND TRUE) set(PYTHONLIBS_FOUND TRUE)

2
cMake/UseLibPack9x.cmake
View File

@ -11,7 +11,7 @@ include_directories(${FREECAD_LIBPACK_DIR}/include)
set(OPENGL_gl_LIBRARY opengl32 glu32) set(OPENGL_gl_LIBRARY opengl32 glu32)
# Python # 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_INCLUDE_PATH ${FREECAD_LIBPACK_DIR}/include/Python-2.7.6)
set(PYTHON_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/python.exe) set(PYTHON_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/python.exe)
set(PYTHONLIBS_FOUND TRUE) set(PYTHONLIBS_FOUND TRUE)

3
cMake/UseLibPackCustom.cmake
View File

@ -11,8 +11,7 @@ include_directories(${FREECAD_LIBPACK_DIR}/include)
set(OPENGL_gl_LIBRARY opengl32 glu32) set(OPENGL_gl_LIBRARY opengl32 glu32)
# Python # Python
set(PYTHON_DEBUG_LIBRARY python26_d.lib) set(PYTHON_LIBRARIES optimized python26.lib debug python26_d.lib)
set(PYTHON_LIBRARY python26.lib)
set(PYTHON_INCLUDE_PATH ${FREECAD_LIBPACK_DIR}/include/Python-2.6.4) set(PYTHON_INCLUDE_PATH ${FREECAD_LIBPACK_DIR}/include/Python-2.6.4)
set(PYTHON_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/python.exe) set(PYTHON_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/python.exe)
set(PYTHONLIBS_FOUND TRUE) set(PYTHONLIBS_FOUND TRUE)

6
src/Base/CMakeLists.txt
View File

@ -21,7 +21,7 @@ if(MSVC)
set(FreeCADBase_LIBS set(FreeCADBase_LIBS
${Boost_LIBRARIES} ${Boost_LIBRARIES}
${Boost_DEBUG_LIBRARIES} ${Boost_DEBUG_LIBRARIES}
${PYTHON_LIBRARY} ${PYTHON_LIBRARIES}
debug ${XERCESC_DEBUG_LIBRARIES} debug ${XERCESC_DEBUG_LIBRARIES}
optimized ${XERCESC_LIBRARIES} optimized ${XERCESC_LIBRARIES}
${QT_QTCORE_LIBRARY} ${QT_QTCORE_LIBRARY}
@ -35,7 +35,7 @@ if(MSVC)
) )
elseif(MINGW) elseif(MINGW)
set(FreeCADBase_LIBS set(FreeCADBase_LIBS
${PYTHON_LIBRARY} ${PYTHON_LIBRARIES}
${XERCESC_LIBRARIES} ${XERCESC_LIBRARIES}
${QT_QTCORE_LIBRARY} ${QT_QTCORE_LIBRARY}
${Boost_LIBRARIES} ${Boost_LIBRARIES}
@ -44,7 +44,7 @@ elseif(MINGW)
) )
else(MSVC) else(MSVC)
set(FreeCADBase_LIBS set(FreeCADBase_LIBS
${PYTHON_LIBRARY} ${PYTHON_LIBRARIES}
${XERCESC_LIBRARIES} ${XERCESC_LIBRARIES}
${QT_QTCORE_LIBRARY} ${QT_QTCORE_LIBRARY}
${Boost_LIBRARIES} ${Boost_LIBRARIES}