From f52e315ec33e32069c08a20b10e06dcf95414de9 Mon Sep 17 00:00:00 2001 From: looooo Date: Wed, 21 Jun 2017 00:01:02 +0200 Subject: [PATCH] py3: boost: some diff for the cmake of libarea to work with boost1.64. (at least this is necessary for conda) --- src/Mod/Path/libarea/CMakeLists.txt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Mod/Path/libarea/CMakeLists.txt b/src/Mod/Path/libarea/CMakeLists.txt index 219ec1e5c7..aaf0652136 100644 --- a/src/Mod/Path/libarea/CMakeLists.txt +++ b/src/Mod/Path/libarea/CMakeLists.txt @@ -12,7 +12,15 @@ include_directories(${PYTHON_INCLUDE_DIRS}) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) if(NOT FREECAD_LIBPACK_USE OR FREECAD_LIBPACK_CHECKFILE_CLBUNDLER) - find_package( Boost COMPONENTS python REQUIRED) # find BOOST and boost-python + if(NOT PYTHON_VERSION_MAJOR LESS 3) + find_package( Boost COMPONENTS python3) + if (NOT Boost_PYTHON3_FOUND) + find_package( Boost COMPONENTS python REQUIRED) + endif() + else() + find_package( Boost COMPONENTS python REQUIRED) # find BOOST and boost-python + endif() + if(Boost_FOUND) include_directories(${Boost_INCLUDE_DIRS}) MESSAGE(STATUS "found Boost: " ${Boost_LIB_VERSION})