Skip to content
Snippets Groups Projects
Commit 4ce284b2 authored by Orgis, Dr. Thomas's avatar Orgis, Dr. Thomas
Browse files

DP3: Python includes

parent 4ddac894
No related branches found
No related tags found
No related merge requests found
...@@ -83,10 +83,10 @@ index 173f995..a1357c7 100644 ...@@ -83,10 +83,10 @@ index 173f995..a1357c7 100644
# Parse arguments. # Parse arguments.
# apart from the python files list, there are two additional arguments # apart from the python files list, there are two additional arguments
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ae97ae..73327a8 100644 index 0ae97ae..3abc84e 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/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) find_package(CFITSIO REQUIRED)
...@@ -95,6 +95,8 @@ index 0ae97ae..73327a8 100644 ...@@ -95,6 +95,8 @@ index 0ae97ae..73327a8 100644
-message(STATUS "Using python version ${PYTHON_VERSION_STRING}") -message(STATUS "Using python version ${PYTHON_VERSION_STRING}")
+find_package(Python3 COMPONENTS Interpreter Development) +find_package(Python3 COMPONENTS Interpreter Development)
+message(STATUS "Using python version ${Python3_VERSION}") +message(STATUS "Using python version ${Python3_VERSION}")
+
+include_directories(${Python3_INCLUDE_DIRS})
#Prevent accidentally finding old BoostConfig.cmake file from casapy #Prevent accidentally finding old BoostConfig.cmake file from casapy
set(Boost_NO_BOOST_CMAKE ON) set(Boost_NO_BOOST_CMAKE ON)
...@@ -103,7 +105,7 @@ index 0ae97ae..73327a8 100644 ...@@ -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) find_package(Boost COMPONENTS date_time filesystem python${BOOSTPY} numpy${BOOSTPY} program_options system unit_test_framework REQUIRED)
include_directories(${Boost_INCLUDE_DIR}) 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} ${CASACORE_LIBRARIES}
${Boost_LIBRARIES} ${Boost_LIBRARIES}
${EXTRA_LIBRARIES} ${EXTRA_LIBRARIES}
... ...
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment