diff --git a/CMakeLists.txt b/CMakeLists.txt index c81442d4a..52e5856e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -92,6 +92,7 @@ MESSAGE(STATUS "includedir: ${CMAKE_INSTALL_INCLUDEDIR}") # == Win32 is default behaviour use the LibPack copied in Source tree ========== if(MSVC) OPTION(FREECAD_LIBPACK_USE "Use the LibPack to Build FreeCAD (only Win32 so far)." ON) + OPTION(FREECAD_LIBPACK_USEPYSIDE "Use PySide in LibPack rather to PyQt and Swig." ON) set(FREECAD_LIBPACK_DIR ${CMAKE_SOURCE_DIR} CACHE PATH "Directory of the FreeCAD LibPack") else(MSVC) OPTION(FREECAD_LIBPACK_USE "Use the LibPack to Build FreeCAD (only Win32 so far)." OFF) diff --git a/cMake/UseLibPack8x.cmake b/cMake/UseLibPack8x.cmake index 0d6961d6d..4d01bba21 100644 --- a/cMake/UseLibPack8x.cmake +++ b/cMake/UseLibPack8x.cmake @@ -151,7 +151,25 @@ set(QT_RCC_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/rcc.exe) set(QT_HELPCOMPILER_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/qhelpgenerator.exe) set(QT_COLLECTIOMGENERATOR_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/qcollectiongenerator.exe) +if(FREECAD_LIBPACK_USEPYSIDE) + # SHIBOKEN_INCLUDE_DIR - Directories to include to use SHIBOKEN + # SHIBOKEN_LIBRARY - Files to link against to use SHIBOKEN + # SHIBOKEN_BINARY - Executable name + SET(SHIBOKEN_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/shiboken) + SET(SHIBOKEN_LIBRARY optimized ${FREECAD_LIBPACK_DIR}/lib/shiboken-python2.6.lib debug ${FREECAD_LIBPACK_DIR}/lib/shiboken-python2.6_d.lib) + set(SHIBOKEN_BINARY ${FREECAD_LIBPACK_DIR}/bin/shiboken) + + # PYSIDE_INCLUDE_DIR - Directories to include to use PySide + # PYSIDE_LIBRARY - Files to link against to use PySide + # PYSIDE_PYTHONPATH - Path to where the PySide Python module files could be found + # PYSIDE_TYPESYSTEMS - Type system files that should be used by other bindings extending PySide + + SET(PYSIDE_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/PySide) + SET(PYSIDE_LIBRARY optimized ${FREECAD_LIBPACK_DIR}/lib/pyside-python2.6.lib debug ${FREECAD_LIBPACK_DIR}/lib/pyside-python2.6_d.lib) + #SET(PYSIDE_PYTHONPATH ${FREECAD_LIBPACK_DIR}/pyside/Lib/site-packages) + #SET(PYSIDE_TYPESYSTEMS ${FREECAD_LIBPACK_DIR}/pyside/share/PySide/typesystems) +endif(FREECAD_LIBPACK_USEPYSIDE) MACRO (QT4_EXTRACT_OPTIONS _qt4_files _qt4_options) SET(${_qt4_files})