From 4ce284b26bda6a5e578edb75568ca98edb94bd2b Mon Sep 17 00:00:00 2001 From: "Dr. Thomas Orgis" <thomas.orgis@uni-hamburg.de> Date: Thu, 14 May 2020 16:27:02 +0200 Subject: [PATCH] DP3: Python includes --- DP3-buildfix.patch | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/DP3-buildfix.patch b/DP3-buildfix.patch index 2d7611c..90f0900 100644 --- a/DP3-buildfix.patch +++ b/DP3-buildfix.patch @@ -83,10 +83,10 @@ index 173f995..a1357c7 100644 # Parse arguments. # apart from the python files list, there are two additional arguments diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0ae97ae..73327a8 100644 +index 0ae97ae..3abc84e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -44,13 +44,12 @@ endif(IDGAPI_LIBRARIES AND IDGAPI_INCLUDE_DIRS) +@@ -44,13 +44,14 @@ endif(IDGAPI_LIBRARIES AND IDGAPI_INCLUDE_DIRS) find_package(CFITSIO REQUIRED) @@ -95,6 +95,8 @@ index 0ae97ae..73327a8 100644 -message(STATUS "Using python version ${PYTHON_VERSION_STRING}") +find_package(Python3 COMPONENTS Interpreter Development) +message(STATUS "Using python version ${Python3_VERSION}") ++ ++include_directories(${Python3_INCLUDE_DIRS}) #Prevent accidentally finding old BoostConfig.cmake file from casapy set(Boost_NO_BOOST_CMAKE ON) @@ -103,7 +105,7 @@ index 0ae97ae..73327a8 100644 find_package(Boost COMPONENTS date_time filesystem python${BOOSTPY} numpy${BOOSTPY} program_options system unit_test_framework REQUIRED) include_directories(${Boost_INCLUDE_DIR}) -@@ -198,7 +197,7 @@ set(EXTRA_LIBRARIES ${EXTRA_LIBRARIES} +@@ -198,7 +199,7 @@ set(EXTRA_LIBRARIES ${EXTRA_LIBRARIES} ${CASACORE_LIBRARIES} ${Boost_LIBRARIES} ${EXTRA_LIBRARIES} -- GitLab