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
00ea9f3f
Commit
00ea9f3f
authored
2 years ago
by
Santiago Ospina De Los Ríos
Committed by
Timo Koch
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Pass package name as argument for dune_link_dune_py
parent
24a47e88
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!1159
Pass package name as argument for dune_link_dune_py
Pipeline
#52853
passed
2 years ago
Stage: .pre
Stage: test
Stage: downstream
Pipeline: Dune Nightly Test
#52854
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
cmake/modules/DunePythonInstallPackage.cmake
+11
-4
11 additions, 4 deletions
cmake/modules/DunePythonInstallPackage.cmake
with
11 additions
and
4 deletions
cmake/modules/DunePythonInstallPackage.cmake
+
11
−
4
View file @
00ea9f3f
...
...
@@ -264,15 +264,21 @@ endfunction()
function
(
dune_link_dune_py
)
# Parse Arguments
set
(
OPTION
)
set
(
SINGLE PATH INSTALL_TARGET
)
set
(
SINGLE PATH INSTALL_TARGET
PACKAGENAME
)
set
(
MULTI CMAKE_METADATA_FLAGS
)
cmake_parse_arguments
(
LINKDUNEPY
"
${
OPTION
}
"
"
${
SINGLE
}
"
"
${
MULTI
}
"
${
ARGN
}
)
if
(
LINKDUNEPY_UNPARSED_ARGUMENTS
)
message
(
WARNING
"Unparsed arguments in dune_python_install_package: This often indicates typos!"
)
endif
()
# check the package name argument
if
(
"
${
LINKDUNEPY_PACKAGENAME
}
"
STREQUAL
""
)
message
(
FATAL_ERROR
"PACKAGENAME cannot be empty!"
)
endif
()
# set the meta data file path for this package
set
(
LINKDUNEPY_CMAKE_METADATA_FILE
"
dune
/data/
${
ProjectName
}
.cmake"
)
set
(
LINKDUNEPY_CMAKE_METADATA_FILE
"
${
LINKDUNEPY_PACKAGENAME
}
/data/
${
ProjectName
}
.cmake"
)
# Locate the cmake/scripts directory of dune-common
dune_module_path
(
MODULE dune-common
...
...
@@ -544,7 +550,7 @@ function(dune_python_configure_bindings)
# set the new package name
if
(
"
${
PYCONFBIND_PACKAGENAME
}
"
STREQUAL
""
)
set
(
PYCONFBIND_PACKAGENAME
"dune"
)
set
(
PYCONFBIND_PACKAGENAME
"dune"
)
endif
()
if
(
"
${
DUNE_BINDINGS_PACKAGENAME
}
"
STREQUAL
""
)
...
...
@@ -602,8 +608,9 @@ function(dune_python_configure_bindings)
if
(
NOT PYTHON_PACKAGE_FAILED
)
dune_link_dune_py
(
PATH
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
PYCONFBIND_PATH
}
CMAKE_METADATA_FLAGS
${
PYCONFBIND_CMAKE_METADATA_FLAGS
}
PACKAGENAME
${
PYCONFBIND_PACKAGENAME
}
INSTALL_TARGET install_python_package_
${
PYCONFBIND_PACKAGENAME
}
CMAKE_METADATA_FLAGS
${
PYCONFBIND_CMAKE_METADATA_FLAGS
}
)
else
()
message
(
WARNING
"python binding configuration failed - no linking done"
)
...
...
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