Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
maca
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Redmine
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Analysers
maca
Merge requests
!7
Resolve "Python 3.6 compatibility"
Code
Review changes
Check out branch
Download
Patches
Plain diff
Expand sidebar
Merged
Resolve "Python 3.6 compatibility"
11-python-3-6-compatibility
into
develop
Overview
0
Commits
1
Pipelines
0
Changes
1
Merged
Resolve "Python 3.6 compatibility"
Wiktor Walentynowicz
requested to merge
11-python-3-6-compatibility
into
develop
Nov 7, 2019
Overview
0
Commits
1
Pipelines
0
Changes
1
Closes
#11 (closed)
Edited
Nov 7, 2019
by
Wiktor Walentynowicz
0
0
Merge request reports
Compare
develop
develop (base)
and
latest version
latest version
35b37f7e
1 commit,
Nov 7, 2019
1 file
+
10
−
8
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
swig/CMakeLists.txt
+
10
−
8
View file @ 35b37f7e
Edit in single-file editor
Open in Web IDE
Show full file
@@ -27,16 +27,18 @@ INCLUDE(${SWIG_USE_FILE})
include_directories
(
${
Libmaca_SOURCE_DIR
}
"../libmaca"
)
link_directories
(
${
Libmaca_BINARY_DIR
}
)
find_package
(
PythonLibs 2
)
find_package
(
PythonInterp
)
# Python 2 support ended on 1st January 2020.
find_package
(
PythonLibs 3.6
)
find_package
(
PythonInterp 3.6
)
# idea taken from pyplot build system
execute_process
(
COMMAND
${
PYTHON_EXECUTABLE
}
-c
"from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='
${
CMAKE_INSTALL_EXEC_PREFIX
}
')"
OUTPUT_VARIABLE PYTHON_INSTDIR
OUTPUT_STRIP_TRAILING_WHITESPACE
)
#execute_process(
# COMMAND
# ${PYTHON_EXECUTABLE} -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='${CMAKE_INSTALL_EXEC_PREFIX}')"
# OUTPUT_VARIABLE PYTHON_INSTDIR
# OUTPUT_STRIP_TRAILING_WHITESPACE
#)
set
(
PYTHON_INSTDIR
"lib/python3.6/dist-packages"
)
message
(
STATUS
"INFO: "
"python lib:
${
PYTHON_INSTDIR
}
"
)
INCLUDE_DIRECTORIES
(
${
PYTHON_INCLUDE_PATH
}
)
Loading