Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BornAgain
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
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
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mlz
BornAgain
Commits
45501527
Commit
45501527
authored
11 months ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
#932
: last changes
parent
799a09b2
No related branches found
No related tags found
1 merge request
!2474
forgotten in last MR
Pipeline
#136482
passed
11 months ago
Stage: build
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
cmake/multipython/MakePythonWheel.cmake
+5
-18
5 additions, 18 deletions
cmake/multipython/MakePythonWheel.cmake
with
5 additions
and
18 deletions
cmake/multipython/MakePythonWheel.cmake
+
5
−
18
View file @
45501527
...
...
@@ -72,24 +72,17 @@ foreach(_src ${_sources})
configure_file
(
${
_src
}
${
BA_PY_LIBRARY_OUTPUT_DIR
}
)
endforeach
()
##... target BAPyWheel_extra_libs
# external library dependencies
if
(
WIN32
)
set
(
_
extra_lib
s
"
${
BA_Dependencies_WIN32
}
"
)
set
(
_
source
s
"
${
BA_Dependencies_WIN32
}
"
)
else
()
set
(
_
extra_lib
s
"
${
BA_Dependencies
}
"
)
set
(
_
source
s
"
${
BA_Dependencies
}
"
)
endif
()
# store the required extra libraries
set
(
_dst
${
BA_PY_EXTRA_LIBRARY_OUTPUT_DIR
}
)
add_custom_target
(
BAPyWheel_extra_libs
COMMAND
${
CMAKE_COMMAND
}
-E copy
${
_extra_libs
}
${
_dst
}
COMMENT
"
${
header
}
Copying extra libraries {
${
_extra_libs
}
} to '
${
_dst
}
'..."
)
foreach
(
_src
${
_sources
}
)
configure_file
(
${
_src
}
${
BA_PY_EXTRA_LIBRARY_OUTPUT_DIR
}
COPYONLY
)
endforeach
()
##... target BAPyWheel
...
...
@@ -124,9 +117,3 @@ else()
COMMENT
"
${
header
}
Making the Python wheel..."
)
endif
()
set_target_properties
(
BAPyWheel PROPERTIES _EXTRA_LIBRARIES
"
${
_extra_libs
}
"
)
add_dependencies
(
BAPyWheel
BAPyWheel_extra_libs
)
This diff is collapsed.
Click to expand it.
Wuttke, Joachim
@j.wuttke
mentioned in commit
5213be2e
·
11 months ago
mentioned in commit
5213be2e
mentioned in commit 5213be2e675d379f41e76ecfcfa4de1b10b00dc6
Toggle commit list
Wuttke, Joachim
@j.wuttke
mentioned in commit
f1a4398e
·
11 months ago
mentioned in commit
f1a4398e
mentioned in commit f1a4398e886522af3f9c80c71bb8534d40ae78fe
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