From baed57f01ab39faba9b4f04a666ee5a93acb3b4d Mon Sep 17 00:00:00 2001 From: looooo Date: Wed, 30 May 2018 10:35:55 +0200 Subject: [PATCH] conda: osx configuration --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1cfe238299..cae19dceae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -199,6 +199,7 @@ OPTION(FREECAD_USE_EXTERNAL_SMESH "Use system installed smesh instead of the bun 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) +OPTION(BUILD_WITH_CONDA "Set ON if you build freecad with conda" OFF) if (WIN32 OR APPLE) OPTION(FREECAD_USE_QT_FILEDIALOG "Use Qt's file dialog instead of the native one." OFF) else() @@ -449,7 +450,7 @@ if(NOT FREECAD_LIBPACK_USE OR FREECAD_LIBPACK_CHECKFILE_CLBUNDLER) set(Python_ADDITIONAL_VERSIONS "2.7") # For building on OS X -if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT BUILD_WITH_CONDA) # If the user doesn't tell us which package manager they're using if(NOT DEFINED MACPORTS_PREFIX AND NOT DEFINED HOMEBREW_PREFIX) @@ -559,7 +560,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") endif(NOT DEFINED PYTHON_LIBRARY) -endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT BUILD_WITH_CONDA) find_package(PythonInterp REQUIRED) set(Python_ADDITIONAL_VERSIONS ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})