Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
Hamburg LOFAR Toolkit Installation Script
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
hpc
Hamburg LOFAR Toolkit Installation Script
Commits
4ce284b2
Commit
4ce284b2
authored
5 years ago
by
Orgis, Dr. Thomas
Browse files
Options
Downloads
Patches
Plain Diff
DP3: Python includes
parent
4ddac894
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
DP3-buildfix.patch
+5
-3
5 additions, 3 deletions
DP3-buildfix.patch
with
5 additions
and
3 deletions
DP3-buildfix.patch
+
5
−
3
View file @
4ce284b2
...
...
@@ -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,1
2
@@
endif(IDGAPI_LIBRARIES AND IDGAPI_INCLUDE_DIRS)
@@ -44,13 +44,1
4
@@
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 +19
7
,7 @@
set(EXTRA_LIBRARIES ${EXTRA_LIBRARIES}
@@ -198,7 +19
9
,7 @@
set(EXTRA_LIBRARIES ${EXTRA_LIBRARIES}
${CASACORE_LIBRARIES}
${Boost_LIBRARIES}
${EXTRA_LIBRARIES}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment