From 53f54b62f3c1d29950906f1d1d707de742e172b1 Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 16 Apr 2018 13:50:38 +0200 Subject: [PATCH] don't make existence of PySide2 mandatory --- CMakeLists.txt | 23 ++++++++++------- cMake/UseLibPackCLbundler.cmake | 46 ++++++++++++++++++++++++++++++--- src/Mod/Import/CMakeLists.txt | 26 +++++++++---------- 3 files changed, 69 insertions(+), 26 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0544b344f2..cc06f90864 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -936,21 +936,26 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") find_package(PySide REQUIRED HINTS "${PYTHON_LIBRARY_DIR}/cmake") endif(DEFINED MACPORTS_PREFIX) - find_package(Shiboken2)# REQUIRED + find_package(Shiboken2 QUIET)# REQUIRED if(NOT SHIBOKEN_INCLUDE_DIR) - MESSAGE(FATAL_ERROR "====================\n" - "shiboken2 not found.\n" - "====================\n") + MESSAGE("====================\n" + "shiboken2 not found.\n" + "====================\n") endif(NOT SHIBOKEN_INCLUDE_DIR) - find_package(PySide2)# REQUIRED + find_package(PySide2 QUIET)# REQUIRED if(NOT PYSIDE_INCLUDE_DIR) - MESSAGE(FATAL_ERROR "==================\n" - "PySide2 not found.\n" - "==================\n") + MESSAGE("==================\n" + "PySide2 not found.\n" + "==================\n") endif(NOT PYSIDE_INCLUDE_DIR) - find_package(PySide2Tools REQUIRED) # PySide2 utilities (pyside2-uic & pyside2-rcc) + find_package(PySide2Tools QUIET) #REQUIRED # PySide2 utilities (pyside2-uic & pyside2-rcc) + if(NOT PYSIDE2_TOOLS_FOUND) + MESSAGE("=======================\n" + "PySide2Tools not found.\n" + "=======================\n") + endif(NOT PYSIDE2_TOOLS_FOUND) file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Ext/PySide) file(WRITE ${CMAKE_BINARY_DIR}/Ext/PySide/__init__.py "# PySide wrapper\n" diff --git a/cMake/UseLibPackCLbundler.cmake b/cMake/UseLibPackCLbundler.cmake index 01d86c9cff..16ce8b3526 100644 --- a/cMake/UseLibPackCLbundler.cmake +++ b/cMake/UseLibPackCLbundler.cmake @@ -7,10 +7,48 @@ set(OCE_DIR ${FREECAD_LIBPACK_DIR}/lib/cmake CACHE PATH "" FORCE) set(SWIG_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/swig/swig.exe CACHE FILEPATH "Swig" FORCE) -set(PYTHON_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/python.exe CACHE FILEPATH "" FORCE) -set(PYTHON_LIBRARY ${FREECAD_LIBPACK_DIR}/lib/python27.lib CACHE FILEPATH "" FORCE) -set(PYTHON_DEBUG_LIBRARY ${FREECAD_LIBPACK_DIR}/lib/python27_d.lib CACHE FILEPATH "" FORCE) -set(PYTHON_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/python2.7 CACHE PATH "" FORCE) +#set(PYTHON_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/python.exe CACHE FILEPATH "" FORCE) +#set(PYTHON_LIBRARY ${FREECAD_LIBPACK_DIR}/lib/python27.lib CACHE FILEPATH "" FORCE) +#set(PYTHON_DEBUG_LIBRARY ${FREECAD_LIBPACK_DIR}/lib/python27_d.lib CACHE FILEPATH "" FORCE) +#set(PYTHON_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/python2.7 CACHE PATH "" FORCE) + +if (BUILD_QT5) + +# default Qt5 stuff +# Set paths to cmake config files for each Qt module +set(Qt5_ROOT_DIR ${FREECAD_LIBPACK_DIR} CACHE PATH "") + +set (Qt5_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5 CACHE PATH "") +set (Qt5AxBase_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5AxBase CACHE PATH "") +set (Qt5AxContainer_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5AxContainer CACHE PATH "") +set (Qt5AxServer_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5AxServer CACHE PATH "") +set (Qt5Concurrent_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5Concurrent CACHE PATH "") +set (Qt5Core_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5Core CACHE PATH "") +set (Qt5DBus_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5DBus CACHE PATH "") +set (Qt5Designer_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5Designer CACHE PATH "") +set (Qt5Gui_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5Gui CACHE PATH "") +set (Qt5Help_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5Help CACHE PATH "") +set (Qt5LinguistTools_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5LinguistTools CACHE PATH "") +set (Qt5Multimedia_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5Multimedia CACHE PATH "") +set (Qt5MultimediaWidgets_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5MultimediaWidgets CACHE PATH "") +set (Qt5Network_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5Network CACHE PATH "") +set (Qt5OpenGL_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5OpenGL CACHE PATH "") +set (Qt5OpenGLExtensions_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5OpenGLExtensions CACHE PATH "") +set (Qt5PrintSupport_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5PrintSupport CACHE PATH "") +set (Qt5Qml_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5Qml CACHE PATH "") +set (Qt5Quick_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5Quick CACHE PATH "") +set (Qt5QuickTest_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5QuickTest CACHE PATH "") +set (Qt5QuickWidgets_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5QuickWidgets CACHE PATH "") +set (Qt5Sql_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5Sql CACHE PATH "") +set (Qt5Svg_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5Svg CACHE PATH "") +set (Qt5Test_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5Test CACHE PATH "") +set (Qt5UiPlugin_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5UiPlugin CACHE PATH "") +set (Qt5UiTools_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5UiTools CACHE PATH "") +set (Qt5Widgets_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5Widgets CACHE PATH "") +set (Qt5Xml_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5Xml CACHE PATH "") +set (Qt5XmlPatterns_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5XmlPatterns CACHE PATH "") + +endif (BUILD_QT5) find_library(XercesC_LIBRARIES xerces-c_3 "${FREECAD_LIBPACK_DIR}/lib") find_library(XercesC_DEBUG_LIBRARIES xerces-c_3D "${FREECAD_LIBPACK_DIR}/lib") diff --git a/src/Mod/Import/CMakeLists.txt b/src/Mod/Import/CMakeLists.txt index a20f9ad804..383057edea 100644 --- a/src/Mod/Import/CMakeLists.txt +++ b/src/Mod/Import/CMakeLists.txt @@ -4,21 +4,21 @@ if(BUILD_GUI) add_subdirectory(Gui) endif(BUILD_GUI) -IF (BUILD_GUI) - PYSIDE_WRAP_RC(Import_QRC_SRCS Resources/Import.qrc) -ENDIF (BUILD_GUI) +#IF (BUILD_GUI) +# PYSIDE_WRAP_RC(Import_QRC_SRCS Resources/Import.qrc) +#ENDIF (BUILD_GUI) -ADD_CUSTOM_TARGET(ImportRC ALL - SOURCES ${Import_QRC_SRCS} -) +#ADD_CUSTOM_TARGET(ImportRC ALL +# SOURCES ${Import_QRC_SRCS} +#) -IF (BUILD_GUI) - fc_target_copy_resource(ImportRC - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/Mod/Import - Import_rc.py) -ENDIF (BUILD_GUI) +#IF (BUILD_GUI) +# fc_target_copy_resource(ImportRC +# ${CMAKE_CURRENT_BINARY_DIR} +# ${CMAKE_BINARY_DIR}/Mod/Import +# Import_rc.py) +#ENDIF (BUILD_GUI) INSTALL( FILES @@ -26,7 +26,7 @@ INSTALL( InitGui.py gzip_utf8.py stepZ.py - ${Import_QRC_SRCS} + #${Import_QRC_SRCS} DESTINATION Mod/Import )