diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e0a43aa90..439c581f44 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -186,7 +186,6 @@ endif(MSVC) # Switch to build FreeCAD with Qt5 OPTION(BUILD_QT5 "Build with Qt5." OFF) OPTION(BUILD_GUI "Build FreeCAD Gui. Otherwise you have only the command line and the Python import module." ON) -OPTION(FREECAD_MAINTAINERS_BUILD "Build FreeCAD for Maintainers, with Docu and 3rd party libs. On Windows the Installer is built." OFF) OPTION(FREECAD_USE_EXTERNAL_ZIPIOS "Use system installed zipios++ instead of the bundled." OFF) OPTION(FREECAD_USE_EXTERNAL_SMESH "Use system installed smesh instead of the bundled." OFF) OPTION(FREECAD_USE_EXTERNAL_KDL "Use system installed orocos-kdl instead of the bundled." OFF) @@ -1158,102 +1157,17 @@ add_subdirectory(data) # ================================================================================ # == Packaging =================================================================== -if(FREECAD_MAINTAINERS_BUILD AND NOT WIN32) - set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "An extensible Open Source CAx program") - set(CPACK_PACKAGE_VENDOR "FreeCAD development team") - if(WIN32) - set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.Win32") - else(WIN32) - set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.Linux") - endif(WIN32) - set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/copying.lib") - set(CPACK_PACKAGE_VERSION_MAJOR ${PACKAGE_VERSION_MAJOR}) - set(CPACK_PACKAGE_VERSION_MINOR ${PACKAGE_VERSION_MINOR}) - set(CPACK_PACKAGE_VERSION_PATCH ${PACKAGE_VERSION_PATCH}) - set(CPACK_SOURCE_PACKAGE_FILE_NAME ${PACKAGE_NAME}-${PACKAGE_VERSION}) - - #for debian: 'cmake .. -DFREECAD_MAINTAINERS_BUILD=TRUE -DCPACK_GENERATOR="DEB"' - IF( CMAKE_SIZEOF_VOID_P EQUAL 4 ) - set(PKG_ARCH i386) - ELSE( CMAKE_SIZEOF_VOID_P EQUAL 4 ) - set(PKG_ARCH amd64) - ENDIF( CMAKE_SIZEOF_VOID_P EQUAL 4 ) - set(CPACK_DEBIAN_PACKAGE_SECTION "science") - set(CPACK_DEBIAN_PACKAGE_DEPENDS "python, oce | opencascade, libqtgui4, libcoin60, libxerces-c3.1, zlib1g, libboost-dev, libeigen2-dev") - set(CPACK_PACKAGE_CONTACT "") - set(CPACK_PACKAGE_FILE_NAME "${PACKAGE_NAME}-${PACKAGE_VERSION}_${PKG_ARCH}") - - if(WIN32) - set(CPACK_GENERATOR "ZIP") - set(CPACK_SOURCE_GENERATOR "ZIP") - else(WIN32) - if( CPACK_GENERATOR STREQUAL "" ) - set(CPACK_GENERATOR "TGZ") - set(CPACK_SOURCE_GENERATOR "TGZ") - endif() - endif(WIN32) - file(GLOB DOT ".*") - file(GLOB TILD "*~") - set(CPACK_SOURCE_IGNORE_FILES - "${DOT}" - "${TILD}" - ".a$" - ".am$" - ".in$" - ".bat$" - ".o$" - ".so$" - ".m4$" - "/_build/" - "/_cmake/" - "/.deps/" - "/.svn/" - "/CMakeFiles/" - "/CVS/" - "/autom4te.cache/" - "/build/" - "/debian/" - "/debug/" - "/docs/" - "/m4/" - "/qt-build/" - "/CxImage/" - "/WindowsInstaller/" - "AdditionalInfo.txt$" - "CMakeCache.txt$" - "Makefile$" - "\\\\.sh$" - "_CPack_" - "config.h$" - "config.log$" - "config.status$" - "configure$" - "configure.ac$" - "Doxyfile" - "html$" - "stamp-h1$" - ".swp$" - "tar.bz2" - "tar.gz" - "~$" - ) - set(CPACK_SOURCE_STRIP_FILES "") - include(CPack) - - #ADD_CUSTOM_TARGET(DIST make package_source) - -endif(FREECAD_MAINTAINERS_BUILD AND NOT WIN32) - #add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source) - add_custom_target(dist-git +#add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source) +add_custom_target(dist-git COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/makedist.py --srcdir=${CMAKE_SOURCE_DIR} --bindir=${CMAKE_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - add_custom_target(distdfsg-git +) +add_custom_target(distdfsg-git COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/makedist.py --srcdir=${CMAKE_SOURCE_DIR} --bindir=${CMAKE_BINARY_DIR} --dfsg WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) +) if(CMAKE_COMPILER_IS_GNUCXX OR MINGW) add_custom_target(distcheck-git COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/makedist.py diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4045d8a0de..a90e129946 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -16,10 +16,6 @@ if(BUILD_TEMPLATE) endif(BUILD_TEMPLATE) -if(FREECAD_MAINTAINERS_BUILD AND WIN32) - #add_subdirectory(WindowsInstaller) -endif(FREECAD_MAINTAINERS_BUILD AND WIN32) - if(FREECAD_CREATE_MAC_APP) add_subdirectory(MacAppBundle) endif(FREECAD_CREATE_MAC_APP)