Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-xt
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
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ag-ohlberger
dune-community
dune-xt
Commits
34bf1174
Unverified
Commit
34bf1174
authored
6 years ago
by
Dr. Felix Tobias Schindler
Committed by
GitHub
6 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #158 from dune-community/fix-install-of-python-package
Fix install of python package
parents
d3f7ee55
b435b51c
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+2
-2
2 additions, 2 deletions
CMakeLists.txt
cmake/modules/DuneUtils.cmake
+1
-1
1 addition, 1 deletion
cmake/modules/DuneUtils.cmake
python/setup.py.in
+2
-3
2 additions, 3 deletions
python/setup.py.in
with
5 additions
and
6 deletions
CMakeLists.txt
+
2
−
2
View file @
34bf1174
...
...
@@ -63,10 +63,10 @@ dune_enable_all_packages(INCLUDE_DIRS
dunextcommon
gtest_dune_xt_common
)
include
(
Dune
XT
InstallPythonPackage
)
include
(
Dune
Pybindxi
InstallPythonPackage
)
# this symlinks all files in python/ to the binary dir and install into the virtualenv from there thereby making the
# compiled extensions directly usable from the venv
dune_
xt
_install_python_package
(
PATH python
)
dune_
pybindxi
_install_python_package
(
PATH python
)
include_dependent_binary_python_dirs
()
# do not change order here
include
(
DuneUtils
)
...
...
This diff is collapsed.
Click to expand it.
cmake/modules/DuneUtils.cmake
+
1
−
1
View file @
34bf1174
...
...
@@ -15,7 +15,7 @@
include
(
CheckCXXSourceCompiles
)
include
(
DuneXtCommonMacros
)
include
(
CTest
)
include
(
Dune
XT
InstallPythonPackage
)
include
(
Dune
Pybindxi
InstallPythonPackage
)
function
(
TO_LIST_SPACES _LIST_NAME OUTPUT_VAR
)
set
(
NEW_LIST_SPACE
)
...
...
This diff is collapsed.
Click to expand it.
python/setup.py.in
+
2
−
3
View file @
34bf1174
...
...
@@ -5,12 +5,11 @@
# https://github.com/dune-community/dune-xt-common
# Copyright 2009-2018 dune-xt-common developers and contributors. All rights reserved.
# License: Dual licensed as BSD 2-Clause License (http://opensource.org/licenses/BSD-2-Clause)
# or GPL-2.0+ (http://opensource.org/licenses/gpl-license)
# with "runtime exception" (http://www.dune-project.org/license.html)
# Authors:
# Felix Schindler (2017)
# Rene Milk (2016 - 2018)
#
# or GPL-2.0+ (http://opensource.org/licenses/gpl-license)
# with "runtime exception" (http://www.dune-project.org/license.html)
# ~~~
import
sys
...
...
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