Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-common
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Core Modules
dune-common
Commits
f954a5a1
Commit
f954a5a1
authored
3 years ago
by
Andreas Dedner
Browse files
Options
Downloads
Patches
Plain Diff
provide a standard setup.py.in since it the same one is used in all modules
parent
37a1f6ad
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!960
refactor the way python is used in dune
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
cmake/modules/DunePythonInstallPackage.cmake
+7
-3
7 additions, 3 deletions
cmake/modules/DunePythonInstallPackage.cmake
cmake/scripts/CMakeLists.txt
+1
-0
1 addition, 0 deletions
cmake/scripts/CMakeLists.txt
cmake/scripts/setup.py.in
+15
-0
15 additions, 0 deletions
cmake/scripts/setup.py.in
with
23 additions
and
3 deletions
cmake/modules/DunePythonInstallPackage.cmake
+
7
−
3
View file @
f954a5a1
...
...
@@ -74,9 +74,13 @@ function(dune_python_install_package)
endforeach
()
set
(
PYINST_FULLPATH
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
PYINST_PATH
}
)
if
(
EXISTS
${
PYINST_FULLPATH
}
/setup.py.in
)
configure_file
(
${
PYINST_PATH
}
/setup.py.in
${
PYINST_PATH
}
/setup.py
)
set
(
PYINST_FULLPATH
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
PYINST_PATH
}
)
if
(
EXISTS
${
PYINST_FULLPATH
}
)
if
(
EXISTS
${
PYINST_FULLPATH
}
/setup.py.in
)
configure_file
(
${
PYINST_PATH
}
/setup.py.in
${
PYINST_PATH
}
/setup.py
)
else
()
configure_file
(
${
scriptdir
}
/setup.py.in
${
PYINST_PATH
}
/setup.py
)
endif
()
set
(
PYINST_FULLPATH
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
PYINST_PATH
}
)
endif
()
# Error out if setup.py is missing
...
...
This diff is collapsed.
Click to expand it.
cmake/scripts/CMakeLists.txt
+
1
−
0
View file @
f954a5a1
...
...
@@ -11,6 +11,7 @@ install(FILES
module_library.cc.in
pyversion.py
RunDoxygen.cmake
setup.py.in
sphinx_cmake_dune.py
WritePythonCMakeMetadata.cmake
DESTINATION
${
CMAKE_INSTALL_DATAROOTDIR
}
/dune/cmake/scripts
)
...
...
This diff is collapsed.
Click to expand it.
cmake/scripts/setup.py.in
0 → 100644
+
15
−
0
View file @
f954a5a1
from setuptools import setup, find_namespace_packages
pkg = '${RequiredPythonModules}'.replace(';',' ').split(' ')
setup(name="${ProjectName}",
packages=find_namespace_packages(include=['dune.*']),
description="${ProjectDescription}",
version="${ProjectVersionString}",
author="${ProjectAuthor}",
author_email="${ProjectMaintainerEmail}",
zip_safe = 0,
package_data = {'': ['*.so']},
install_requires = pkg,
include_package_data=True,
)
This diff is collapsed.
Click to expand it.
Santiago Ospina De Los Ríos
@santiago.ospina
mentioned in issue
#310 (closed)
·
2 years ago
mentioned in issue
#310 (closed)
mentioned in issue #310
Toggle commit list
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