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
70725acb
There was a problem fetching the pipeline summary.
Commit
70725acb
authored
7 years ago
by
Martin Nolte
Browse files
Options
Downloads
Plain Diff
Merge branch 'cherry-pick-
f850031e
' into 'releases/2.6'
Merge branch 'feature/dont-regire-pip-II' into 'master' See merge request
!425
parents
ccf89e0f
ef6adf49
Branches
Branches containing commit
Tags
Tags containing commit
3 merge requests
!586
Centralize CI config for 2.6 release
,
!531
Update CI for 2.6 release branch
,
!425
Merge branch 'feature/dont-regire-pip-II' into 'master'
Pipeline
#
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
cmake/modules/DunePythonInstallPackage.cmake
+10
-5
10 additions, 5 deletions
cmake/modules/DunePythonInstallPackage.cmake
with
10 additions
and
5 deletions
cmake/modules/DunePythonInstallPackage.cmake
+
10
−
5
View file @
70725acb
...
...
@@ -40,11 +40,6 @@ function(dune_python_install_package)
message
(
WARNING
"Unparsed arguments in dune_python_install_package: This often indicates typos!"
)
endif
()
# Check for the presence of the pip package
if
(
NOT DUNE_PYTHON_pip_FOUND
)
message
(
FATAL_ERROR
"dune_python_install_package: Requested installations, but pip was not found!"
)
endif
()
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
)
...
...
@@ -88,6 +83,16 @@ function(dune_python_install_package)
"
${
PYINST_FULLPATH
}
"
)
# Leave this function if no installation rules are required
if
(
"
${
DUNE_PYTHON_INSTALL_LOCATION
}
"
STREQUAL
"none"
AND NOT DUNE_PYTHON_VIRTUALENV_SETUP
)
return
()
endif
()
# Check for the presence of the pip package
if
(
NOT DUNE_PYTHON_pip_FOUND
)
message
(
FATAL_ERROR
"dune_python_install_package: Requested installations, but pip was not found!"
)
endif
()
#
# If requested, install into the configure-time Dune virtualenv
#
...
...
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