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
61ba1e26
Commit
61ba1e26
authored
2 years ago
by
Andreas Dedner
Browse files
Options
Downloads
Patches
Plain Diff
fix an issue introduced in MR1103 (together with MR1148)
parent
7b9ec5fd
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!1157
fix an issue introduced in MR1103 (together with MR1148)
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
cmake/modules/DunePythonInstallPackage.cmake
+13
-5
13 additions, 5 deletions
cmake/modules/DunePythonInstallPackage.cmake
with
13 additions
and
5 deletions
cmake/modules/DunePythonInstallPackage.cmake
+
13
−
5
View file @
61ba1e26
...
...
@@ -298,8 +298,10 @@ function(dune_link_dune_py)
set
(
metadatafile
${
LINKDUNEPY_PATH
}
/
${
LINKDUNEPY_CMAKE_METADATA_FILE
}
)
# Collect some variables that we would like to export
set
(
_deps
${
ProjectName
}
)
set
(
_export_builddirs
"
${
CMAKE_BINARY_DIR
}
"
)
foreach
(
mod
${
ALL_DEPENDENCIES
}
)
string
(
APPEND _deps
"
${
mod
}
"
)
string
(
APPEND _export_builddirs
"
\;
${${
mod
}
_DIR
}
"
)
endforeach
()
...
...
@@ -349,13 +351,17 @@ function(dune_link_dune_py)
endif
()
# Make sure to generate the metadata for the build stage
# Issue: parameter forwarding fails when using dune_execute_process so
# reverting to 'execute_process' for now. Alternative would be to extra escape the ';':
# e.g. string(REPLACE ";" "\\\\\\\;" _export_builddirs # "${_export_builddirs}")
# and the same for the DEPS argument.
if
(
SKBUILD
)
# this is the only version of the metadata we need for the package installation
message
(
STATUS
"Generating the CMake metadata file at
${
LINKDUNEPY_CMAKE_METADATA_FILE
}
"
)
dune_
execute_process
(
execute_process
(
COMMAND
${
CMAKE_COMMAND
}
-Dmetadatafile=
${
metadatafile
}
-DDEPS=
${
PROJECT_NAME
}
;
${
ALL_DEPENDENCIES
}
-DDEPS=
${
_deps
}
-DMODULENAME=
${
PROJECT_NAME
}
-DCMAKE_FLAGS=
${
_cmake_flags
}
-P
${
scriptdir
}
/WritePythonCMakeMetadata.cmake
...
...
@@ -367,22 +373,24 @@ function(dune_link_dune_py)
else
()
# this is the build version - keep in mind there is an install version further down
message
(
STATUS
"Generating the CMake metadata file at
${
LINKDUNEPY_CMAKE_METADATA_FILE
}
"
)
dune_
execute_process
(
execute_process
(
COMMAND
${
CMAKE_COMMAND
}
-Dmetadatafile=
${
metadatafile
}
-DDEPBUILDDIRS=
${
_export_builddirs
}
-DDEPS=
${
PROJECT_NAME
}
;
${
ALL_DEPENDENCIES
}
-DDEPS=
${
_deps
}
-DMODULENAME=
${
PROJECT_NAME
}
-DCMAKE_FLAGS=
${
_cmake_flags
}
-DINSTALL_PREFIX=
${
CMAKE_INSTALL_PREFIX
}
-P
${
scriptdir
}
/WritePythonCMakeMetadata.cmake
)
# WARNING_MESSAGE "Writing metadata failed"
if
(
NOT
"
${
DUNE_PYTHON_INSTALL_LOCATION
}
"
STREQUAL
"none"
)
add_custom_target
(
metadata_
${
LINKDUNEPY_INSTALL_TARGET
}
COMMAND
${
CMAKE_COMMAND
}
-Dmetadatafile=
${
metadatafile
}
-DDEPS=
"
${
PROJECT_NAME
}
;
${
ALL_DEPENDENCIES
}
"
-DDEPS=
${
_deps
}
-DMODULENAME=
${
PROJECT_NAME
}
-DCMAKE_FLAGS=
"
${
_cmake_flags
}
"
-DINSTALL_PREFIX=
${
CMAKE_INSTALL_PREFIX
}
...
...
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