From ae6512500b042ae8d98c5ffb2e596e42a5f2129d Mon Sep 17 00:00:00 2001 From: looooo Date: Tue, 13 Feb 2018 20:44:40 +0100 Subject: [PATCH] change pybind11/boost handlinG --- src/Mod/Path/libarea/CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Mod/Path/libarea/CMakeLists.txt b/src/Mod/Path/libarea/CMakeLists.txt index 087c911ddd..5362a200cb 100644 --- a/src/Mod/Path/libarea/CMakeLists.txt +++ b/src/Mod/Path/libarea/CMakeLists.txt @@ -14,7 +14,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}) OPTION(USE_BOOST_PYTHON "use BOOST_PYTHON, otherwise use PYBIND11" ON) -if(USE_BOOST_PYTHON) +if(NOT FREECAD_USE_PYBIND11) if(NOT FREECAD_LIBPACK_USE OR FREECAD_LIBPACK_CHECKFILE_CLBUNDLER) # boost-python >= 1.67 on some platforms has suffix set(BOOST_PY_SUFFIX ${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) @@ -40,7 +40,7 @@ if(USE_BOOST_PYTHON) else() include_directories(${Boost_INCLUDE_DIRS}) endif() -endif(USE_BOOST_PYTHON) +endif(NOT FREECAD_USE_PYBIND11) # this defines the source-files for library @@ -66,15 +66,15 @@ set(AREA_SRC_CLIPPER ) # this defines the additional source-files for python module (wrapper to libarea) -if (USE_BOOST_PYTHON) +if (NOT FREECAD_USE_PYBIND11) set(PYAREA_SRC PythonStuff.cpp ) -else(USE_BOOST_PYTHON) +else (NOT FREECAD_USE_PYBIND11) set(PYAREA_SRC pyarea.cpp ) -endif(USE_BOOST_PYTHON) +endif (NOT FREECAD_USE_PYBIND11) # this defines the headers if(DEFINED INCLUDE_INSTALL_DIR)