From c518744e396fe9adc59a4b555a900d4f1b664415 Mon Sep 17 00:00:00 2001 From: looooo Date: Tue, 10 Apr 2018 20:25:43 +0200 Subject: [PATCH] cmake stuff --- CMakeLists.txt | 1 + src/Mod/MeshPart/App/CMakeLists.txt | 4 ---- src/Mod/Path/libarea/CMakeLists.txt | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b5d7cb2ee6..a6441b367b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -589,6 +589,7 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") endif(FREECAD_USE_PCL) # -------------------------------- PyBind11 ----------------------------- +# necessary for flat-mesh feature OPTION(FREECAD_USE_PYBIND11 "Use pybind11" OFF) if (FREECAD_USE_PYBIND11) find_package(pybind11 REQUIRED) diff --git a/src/Mod/MeshPart/App/CMakeLists.txt b/src/Mod/MeshPart/App/CMakeLists.txt index f54859d11d..68ed18a50f 100644 --- a/src/Mod/MeshPart/App/CMakeLists.txt +++ b/src/Mod/MeshPart/App/CMakeLists.txt @@ -90,10 +90,6 @@ if (FREECAD_USE_PYBIND11) MeshFlatteningNurbs.cpp MeshFlatteningLscmRelax.h MeshFlatteningLscmRelax.cpp - ) - - SET(FLATMESH_SRCS - ${FLATMESH_SRCS} MeshFlatteningPy.cpp ) diff --git a/src/Mod/Path/libarea/CMakeLists.txt b/src/Mod/Path/libarea/CMakeLists.txt index 5362a200cb..3084693f9b 100644 --- a/src/Mod/Path/libarea/CMakeLists.txt +++ b/src/Mod/Path/libarea/CMakeLists.txt @@ -12,8 +12,6 @@ include_directories(${PYTHON_INCLUDE_DIRS}) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -OPTION(USE_BOOST_PYTHON "use BOOST_PYTHON, otherwise use PYBIND11" ON) - if(NOT FREECAD_USE_PYBIND11) if(NOT FREECAD_LIBPACK_USE OR FREECAD_LIBPACK_CHECKFILE_CLBUNDLER) # boost-python >= 1.67 on some platforms has suffix