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
f0d6b9c5
Commit
f0d6b9c5
authored
7 months ago
by
AlQuemist
Browse files
Options
Downloads
Patches
Plain Diff
rm Numpy from cmake/multipython/FindCustomPython3.cmake
parent
b13fee57
No related branches found
Branches containing commit
No related tags found
1 merge request
!2724
Remove Numpy C-API from the build mechanism (Major change)
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
cmake/multipython/FindCustomPython3.cmake
+4
-7
4 additions, 7 deletions
cmake/multipython/FindCustomPython3.cmake
with
4 additions
and
7 deletions
cmake/multipython/FindCustomPython3.cmake
+
4
−
7
View file @
f0d6b9c5
...
@@ -11,7 +11,7 @@ function(find_custom_python3)
...
@@ -11,7 +11,7 @@ function(find_custom_python3)
cmake_parse_arguments
(
"_"
"DEFAULT_PATH;VERBOSE"
"PATHS"
""
${
ARGN
}
)
cmake_parse_arguments
(
"_"
"DEFAULT_PATH;VERBOSE"
"PATHS"
""
${
ARGN
}
)
# if the version is already found and the variables are cached, then do nothing.
# if the version is already found and the variables are cached, then do nothing.
if
(
Python3_FOUND AND Python3_Development_FOUND
AND Python3_NumPy_FOUND
)
if
(
Python3_FOUND AND Python3_Development_FOUND
)
return
()
return
()
endif
()
endif
()
...
@@ -32,10 +32,10 @@ function(find_custom_python3)
...
@@ -32,10 +32,10 @@ function(find_custom_python3)
# Python version.
# Python version.
if
(
__DEFAULT_PATH
)
if
(
__DEFAULT_PATH
)
find_package
(
Python3 3.
${
version_minor_min
}
REQUIRED
find_package
(
Python3 3.
${
version_minor_min
}
REQUIRED
COMPONENTS Interpreter Development
NumPy
)
COMPONENTS Interpreter Development
)
else
()
else
()
find_package
(
Python3 3.
${
version_minor_min
}
REQUIRED CONFIG
find_package
(
Python3 3.
${
version_minor_min
}
REQUIRED CONFIG
COMPONENTS Interpreter Development
NumPy
COMPONENTS Interpreter Development
PATHS
"
${
__PATHS
}
"
NO_DEFAULT_PATH
)
PATHS
"
${
__PATHS
}
"
NO_DEFAULT_PATH
)
endif
()
endif
()
...
@@ -45,13 +45,12 @@ function(find_custom_python3)
...
@@ -45,13 +45,12 @@ function(find_custom_python3)
# store the exported parameters in the internal cache;
# store the exported parameters in the internal cache;
# eg., with pytag 'py39', 'Python3_LIBRARY_DIRS_py39' will be exported, etc.
# eg., with pytag 'py39', 'Python3_LIBRARY_DIRS_py39' will be exported, etc.
set
(
_exportPars Python3_FOUND Python3_Development_FOUND
Python3_NumPy_FOUND
set
(
_exportPars Python3_FOUND Python3_Development_FOUND
Python3_VERSION
Python3_VERSION
Python3_VERSION_MAJOR Python3_VERSION_MINOR Python3_VERSION_PATCH
Python3_VERSION_MAJOR Python3_VERSION_MINOR Python3_VERSION_PATCH
Python3_INCLUDE_DIRS Python3_LIBRARY_DIRS
Python3_INCLUDE_DIRS Python3_LIBRARY_DIRS
Python3_SITELIB Python3_STDLIB
Python3_SITELIB Python3_STDLIB
Python3_LIBRARIES Python3_LIBRARY_RELEASE Python3_EXECUTABLE
Python3_LIBRARIES Python3_LIBRARY_RELEASE Python3_EXECUTABLE
Python3_NumPy_VERSION Python3_NumPy_INCLUDE_DIRS
)
)
# Find Python3 DLL under Windows
# Find Python3 DLL under Windows
...
@@ -91,8 +90,6 @@ function(find_custom_python3)
...
@@ -91,8 +90,6 @@ function(find_custom_python3)
message
(
STATUS
" Python3_LIBRARY_DLL:
${
Python3_LIBRARY_DLL
}
"
)
message
(
STATUS
" Python3_LIBRARY_DLL:
${
Python3_LIBRARY_DLL
}
"
)
endif
()
endif
()
message
(
STATUS
" Python3_LIBRARY_DIRS:
${
Python3_LIBRARY_DIRS
}
"
)
message
(
STATUS
" Python3_LIBRARY_DIRS:
${
Python3_LIBRARY_DIRS
}
"
)
message
(
STATUS
" Python3_NumPy_VERSION:
${
Python3_NumPy_VERSION
}
"
)
message
(
STATUS
" Python3_NumPy_INCLUDE_DIRS:
${
Python3_NumPy_INCLUDE_DIRS
}
"
)
# if(Python3_FOUND)
# if(Python3_FOUND)
# message(STATUS " Exported parameters: \{${_exportPars}\}")
# message(STATUS " Exported parameters: \{${_exportPars}\}")
# endif()
# endif()
...
...
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