+ fixes #2329: remove the 2 now obsolete Pivy versions distributed wi…

…th FreeCAD source code

CMakeLists.txt

@@ -117,7 +117,6 @@ endif(MSVC)
 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 build." OFF)
 OPTION(FREECAD_USE_EXTERNAL_ZIPIOS "Use system installed zipios++ instead of the bundled." OFF)
-OPTION(FREECAD_USE_EXTERNAL_PIVY "Use system installed python-pivy instead of the bundled." ON)
 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)
 OPTION(FREECAD_USE_FREETYPE "Builds the features using FreeType libs" ON)
@@ -200,7 +199,6 @@ endif(NOT MSVC)
 # if this is set override some options
 if (FREECAD_BUILD_DEBIAN)
     set(FREECAD_USE_EXTERNAL_ZIPIOS ON)
-    set(FREECAD_USE_EXTERNAL_PIVY ON)
     # A Debian package for SMESH doesn't exist
     #set(FREECAD_USE_EXTERNAL_SMESH ON)
 endif (FREECAD_BUILD_DEBIAN)
@@ -381,7 +379,6 @@ if(FREECAD_LIBPACK_USE)
         set(FREECAD_LIBPACK_VERSION "9.x" CACHE STRING "Displays if the libpack has been found" FORCE)
         include(cMake/UseLibPack9x.cmake)
         set(SWIG_EXECUTABLE ${FREECAD_LIBPACK_DIR}/tools/swigwin-2.0.11/swig.exe CACHE STRING "Swig" FORCE)
-        set(FREECAD_USE_EXTERNAL_PIVY ON CACHE BOOL "Switch off local pivy" FORCE)
         set(FREECAD_LIBPACK_PYSIDEUIC_REL   "${FREECAD_LIBPACK_DIR}/pyside-tools/Lib/site-packages")
         file(GLOB FREECAD_LIBPACK_PIVY_COIN "${FREECAD_LIBPACK_DIR}/pivy/*.*")
         file(GLOB FREECAD_LIBPACK_SHIBOKEN  "${FREECAD_LIBPACK_DIR}/shiboken-1.2.1/lib/site-packages/*.pyd")
@@ -971,10 +968,6 @@ if(FREECAD_MAINTAINERS_BUILD AND NOT WIN32)
 	  "tar.gz"
 	  "~$"
 	)
-	#set(CPACK_SOURCE_IGNORE_FILES
-    #  ${CPACK_SOURCE_IGNORE_FILES}
-	#  "/Pivy-0.5/"
-	#)
 	set(CPACK_SOURCE_STRIP_FILES "")
 	include(CPack)
 

src/3rdParty/CMakeLists.txt

@@ -3,39 +3,8 @@ if(BUILD_CAM)
     add_subdirectory(ANN)
 endif(BUILD_CAM)
 
-if(BUILD_GUI AND NOT FREECAD_USE_EXTERNAL_PIVY)
-    if(FREECAD_LIBPACK_CHECKFILE6X)
-        add_subdirectory(Pivy)
-    elseif(FREECAD_LIBPACK_CHECKFILE7X)
-        add_subdirectory(Pivy-0.5)
-#elseif(BUILD_GUI AND FREECAD_LIBPACK_CHECKCUSTOM)
-#   find_path(COIN_VERSION3 Inventor/scxml/ScXML.h ${COIN3D_INCLUDE_DIR})
-#   if (COIN_VERSION3)
-#   add_subdirectory(Pivy-0.5)
-#   else (COIN_VERSION3)
-#   add_subdirectory(Pivy)
-#   endif(COIN_VERSION3)
-#endif(BUILD_GUI AND FREECAD_LIBPACK_CHECKFILE6X)
-#if (MINGW)
-#   add_subdirectory(Pivy)
-#endif(MINGW)
-# applies for Unix, MinGW and Windows with custom LibPack
-    else(FREECAD_LIBPACK_CHECKFILE6X)
-        find_path(COIN_VERSION3 Inventor/scxml/ScXML.h ${COIN3D_INCLUDE_DIR})
-        if (COIN_VERSION3)
-        if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Pivy-0.5)
-            add_subdirectory(Pivy-0.5)
-        endif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Pivy-0.5)
-        else (COIN_VERSION3)
-        if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Pivy)
-            add_subdirectory(Pivy)
-        endif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Pivy)
-        endif(COIN_VERSION3)
-    endif (FREECAD_LIBPACK_CHECKFILE6X)
-endif(BUILD_GUI AND NOT FREECAD_USE_EXTERNAL_PIVY)
 
 # Build SalomeMesh for all Platforms since heavily patched
 if (BUILD_SMESH AND NOT FREECAD_USE_EXTERNAL_SMESH)
     add_subdirectory(salomesmesh)
 endif()
-