From b52ab25322a48c437d4e5e53f390c3be4784c718 Mon Sep 17 00:00:00 2001 From: sgrogan Date: Wed, 8 Jul 2015 14:20:17 -0400 Subject: [PATCH] + by default disable bundled pivy and enable use of FreeType on all OS --- CMakeLists.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c1dc1bbdb..1de595e7a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -117,9 +117,10 @@ 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." 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) OPTION(FREECAD_BUILD_DEBIAN "Prepare for a build of a Debian package" OFF) if(APPLE) @@ -180,7 +181,6 @@ OPTION(BUILD_WEB "Build the FreeCAD web module" ON) OPTION(BUILD_VR "Build the FreeCAD Oculus Rift support (need Oculus SDK 4.x or higher)" OFF) if(MSVC) - OPTION(FREECAD_USE_FREETYPE "Builds the features using FreeType libs" OFF) OPTION(BUILD_FEM_NETGEN "Build the FreeCAD FEM module with the NETGEN mesher" ON) OPTION(FREECAD_USE_3DCONNEXION "Use the 3D connexion SDK to support 3d mouse." ON) elseif(APPLE) @@ -194,10 +194,8 @@ else(MSVC) set(FREECAD_USE_3DCONNEXION OFF) endif(MSVC) if(NOT MSVC) - OPTION(FREECAD_USE_FREETYPE "Builds the features using FreeType libs" ON) OPTION(BUILD_FEM_NETGEN "Build the FreeCAD FEM module with the NETGEN mesher" OFF) OPTION(FREECAD_USE_PCL "Build the features that use PCL libs" OFF) - OPTION(FREECAD_USE_EXTERNAL_PIVY "Use system installed python-pivy instead of the bundled." ON) endif(NOT MSVC) # if this is set override some options