Fixes python finding to find python 3 (#100)
* Fixes python finding to find python 3
This commit is contained in:
Matt Schulte
GitHub
Родитель
f4f12de567
Коммит
b157cfbb89
|
|
@ -114,12 +114,9 @@ else()
|
|||
message(STATUS "clang-format version: ${CLANG_VERSION_STRING}")
|
||||
|
||||
if (${CLANG_VERSION_STRING} MATCHES "^.*${VALID_CLANG_FORMAT_VERSION}.*$")
|
||||
find_package(PythonInterp 3)
|
||||
if (NOT ${PYTHONINTERP_FOUND})
|
||||
find_program(PYTHON_EXECUTABLE python3 DOC "python3")
|
||||
if (${PYTHON_EXECUTABLE} STREQUAL "PYTHON_EXECUTABLE-NOTFOUND")
|
||||
message(FATAL_ERROR "Could not find Python3")
|
||||
endif()
|
||||
find_package(Python3 COMPONENTS Interpreter)
|
||||
if (NOT ${Python3_FOUND})
|
||||
message(FATAL_ERROR "Could not find Python3")
|
||||
endif()
|
||||
|
||||
|
||||
|
|
@ -142,7 +139,7 @@ else()
|
|||
|
||||
add_custom_command(
|
||||
OUTPUT ${validateoutput}
|
||||
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/ValidateFormat.py --clangformat "${CLANG_FORMAT}" --file ${file} --output ${validateoutput}
|
||||
COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/ValidateFormat.py --clangformat "${CLANG_FORMAT}" --file ${file} --output ${validateoutput}
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
|
||||
DEPENDS ${file}
|
||||
COMMENT "Validating format of ${file}"
|
||||
|
|
@ -152,7 +149,7 @@ else()
|
|||
|
||||
add_custom_command(
|
||||
OUTPUT ${reformatoutput}
|
||||
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/ValidateFormat.py --reformat --clangformat "${CLANG_FORMAT}" --file ${file} --output ${reformatoutput}
|
||||
COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/ValidateFormat.py --reformat --clangformat "${CLANG_FORMAT}" --file ${file} --output ${reformatoutput}
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
|
||||
DEPENDS ${file}
|
||||
COMMENT "Reformatting ${file}"
|
||||
|
|
|
|||
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
|
@ -0,0 +1,171 @@
|
|||
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
|
||||
# file Copyright.txt or https://cmake.org/licensing for details.
|
||||
|
||||
#[=======================================================================[.rst:
|
||||
FindPython3
|
||||
-----------
|
||||
|
||||
Find Python 3 interpreter, compiler and development environment (include
|
||||
directories and libraries).
|
||||
|
||||
Three components are supported:
|
||||
|
||||
* ``Interpreter``: search for Python 3 interpreter
|
||||
* ``Compiler``: search for Python 3 compiler. Only offered by IronPython.
|
||||
* ``Development``: search for development artifacts (include directories and
|
||||
libraries)
|
||||
|
||||
If no ``COMPONENTS`` is specified, ``Interpreter`` is assumed.
|
||||
|
||||
To ensure consistent versions between components ``Interpreter``, ``Compiler``
|
||||
and ``Development``, specify all components at the same time::
|
||||
|
||||
find_package (Python3 COMPONENTS Interpreter Development)
|
||||
|
||||
This module looks only for version 3 of Python. This module can be used
|
||||
concurrently with :module:`FindPython2` module to use both Python versions.
|
||||
|
||||
The :module:`FindPython` module can be used if Python version does not matter
|
||||
for you.
|
||||
|
||||
Imported Targets
|
||||
^^^^^^^^^^^^^^^^
|
||||
|
||||
This module defines the following :ref:`Imported Targets <Imported Targets>`:
|
||||
|
||||
``Python3::Interpreter``
|
||||
Python 3 interpreter. Target defined if component ``Interpreter`` is found.
|
||||
``Python3::Compiler``
|
||||
Python 3 compiler. Target defined if component ``Compiler`` is found.
|
||||
``Python3::Python``
|
||||
Python 3 library. Target defined if component ``Development`` is found.
|
||||
|
||||
Result Variables
|
||||
^^^^^^^^^^^^^^^^
|
||||
|
||||
This module will set the following variables in your project
|
||||
(see :ref:`Standard Variable Names <CMake Developer Standard Variable Names>`):
|
||||
|
||||
``Python3_FOUND``
|
||||
System has the Python 3 requested components.
|
||||
``Python3_Interpreter_FOUND``
|
||||
System has the Python 3 interpreter.
|
||||
``Python3_EXECUTABLE``
|
||||
Path to the Python 3 interpreter.
|
||||
``Python3_INTERPRETER_ID``
|
||||
A short string unique to the interpreter. Possible values include:
|
||||
* Python
|
||||
* ActivePython
|
||||
* Anaconda
|
||||
* Canopy
|
||||
* IronPython
|
||||
``Python3_STDLIB``
|
||||
Standard platform independent installation directory.
|
||||
|
||||
Information returned by
|
||||
``distutils.sysconfig.get_python_lib(plat_specific=False,standard_lib=True)``.
|
||||
``Python3_STDARCH``
|
||||
Standard platform dependent installation directory.
|
||||
|
||||
Information returned by
|
||||
``distutils.sysconfig.get_python_lib(plat_specific=True,standard_lib=True)``.
|
||||
``Python3_SITELIB``
|
||||
Third-party platform independent installation directory.
|
||||
|
||||
Information returned by
|
||||
``distutils.sysconfig.get_python_lib(plat_specific=False,standard_lib=False)``.
|
||||
``Python3_SITEARCH``
|
||||
Third-party platform dependent installation directory.
|
||||
|
||||
Information returned by
|
||||
``distutils.sysconfig.get_python_lib(plat_specific=True,standard_lib=False)``.
|
||||
``Python3_Compiler_FOUND``
|
||||
System has the Python 3 compiler.
|
||||
``Python3_COMPILER``
|
||||
Path to the Python 3 compiler. Only offered by IronPython.
|
||||
``Python3_COMPILER_ID``
|
||||
A short string unique to the compiler. Possible values include:
|
||||
* IronPython
|
||||
``Python3_Development_FOUND``
|
||||
System has the Python 3 development artifacts.
|
||||
``Python3_INCLUDE_DIRS``
|
||||
The Python 3 include directories.
|
||||
``Python3_LIBRARIES``
|
||||
The Python 3 libraries.
|
||||
``Python3_LIBRARY_DIRS``
|
||||
The Python 3 library directories.
|
||||
``Python3_RUNTIME_LIBRARY_DIRS``
|
||||
The Python 3 runtime library directories.
|
||||
``Python3_VERSION``
|
||||
Python 3 version.
|
||||
``Python3_VERSION_MAJOR``
|
||||
Python 3 major version.
|
||||
``Python3_VERSION_MINOR``
|
||||
Python 3 minor version.
|
||||
``Python3_VERSION_PATCH``
|
||||
Python 3 patch version.
|
||||
|
||||
Hints
|
||||
^^^^^
|
||||
|
||||
``Python3_ROOT_DIR``
|
||||
Define the root directory of a Python 3 installation.
|
||||
|
||||
``Python3_USE_STATIC_LIBS``
|
||||
* If not defined, search for shared libraries and static libraries in that
|
||||
order.
|
||||
* If set to TRUE, search **only** for static libraries.
|
||||
* If set to FALSE, search **only** for shared libraries.
|
||||
|
||||
``Python3_FIND_REGISTRY``
|
||||
On Windows the ``Python3_FIND_REGISTRY`` variable determine the order
|
||||
of preference between registry and environment variables.
|
||||
the ``Python3_FIND_REGISTRY`` variable can be set to empty or one of the
|
||||
following:
|
||||
|
||||
* ``FIRST``: Try to use registry before environment variables.
|
||||
This is the default.
|
||||
* ``LAST``: Try to use registry after environment variables.
|
||||
* ``NEVER``: Never try to use registry.
|
||||
|
||||
``CMAKE_FIND_FRAMEWORK``
|
||||
On OS X the :variable:`CMAKE_FIND_FRAMEWORK` variable determine the order of
|
||||
preference between Apple-style and unix-style package components.
|
||||
|
||||
.. note::
|
||||
|
||||
Value ``ONLY`` is not supported so ``FIRST`` will be used instead.
|
||||
|
||||
.. note::
|
||||
|
||||
If a Python virtual environment is configured, set variable
|
||||
``Python_FIND_REGISTRY`` (Windows) or ``CMAKE_FIND_FRAMEWORK`` (macOS) with
|
||||
value ``LAST`` or ``NEVER`` to select it preferably.
|
||||
|
||||
Commands
|
||||
^^^^^^^^
|
||||
|
||||
This module defines the command ``Python3_add_library`` which have the same
|
||||
semantic as :command:`add_library` but take care of Python module naming rules
|
||||
(only applied if library is of type ``MODULE``) and add dependency to target
|
||||
``Python3::Python``::
|
||||
|
||||
Python3_add_library (my_module MODULE src1.cpp)
|
||||
|
||||
If library type is not specified, ``MODULE`` is assumed.
|
||||
#]=======================================================================]
|
||||
|
||||
|
||||
set (_PYTHON_PREFIX Python3)
|
||||
|
||||
set (_Python3_REQUIRED_VERSION_MAJOR 3)
|
||||
|
||||
include (${CMAKE_CURRENT_LIST_DIR}/FindPython/Support.cmake)
|
||||
|
||||
if (COMMAND __Python3_add_library)
|
||||
macro (Python3_add_library)
|
||||
__Python3_add_library (Python3 ${ARGV})
|
||||
endmacro()
|
||||
endif()
|
||||
|
||||
unset (_PYTHON_PREFIX)
|
||||
|
|
@ -49,7 +49,7 @@ function(target_add_shaders)
|
|||
set(FX_HEADER ${CMAKE_CURRENT_BINARY_DIR}/compiledshaders/${FILE_WE}.hcs)
|
||||
|
||||
set(DEPFILE ${CMAKE_CURRENT_BINARY_DIR}/${FILE_WE}.d)
|
||||
find_package(PythonInterp 3 REQUIRED)
|
||||
find_package(Python3 REQUIRED)
|
||||
|
||||
# CaptureFxcDeps.py will capture the output and add any included .h files to the dependencies
|
||||
# through a depfile for ninja
|
||||
|
|
@ -58,7 +58,7 @@ function(target_add_shaders)
|
|||
if (${CMAKE_GENERATOR} EQUAL "Ninja")
|
||||
add_custom_command(
|
||||
OUTPUT ${FX_HEADER}
|
||||
COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/cmake/CaptureFxcDeps.py --prefix ${PROJECT_BINARY_DIR} --depfile ${DEPFILE} --outputs ${FX_HEADER} --fxc ${FXC} ${FXC_FLAGS} /E"CSMain" /T cs_5_0 /Fh ${FX_HEADER} /Vn ${FILE_WE} ${FILE}
|
||||
COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/cmake/CaptureFxcDeps.py --prefix ${PROJECT_BINARY_DIR} --depfile ${DEPFILE} --outputs ${FX_HEADER} --fxc ${FXC} ${FXC_FLAGS} /E"CSMain" /T cs_5_0 /Fh ${FX_HEADER} /Vn ${FILE_WE} ${FILE}
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
DEPENDS ${FILE} ${TARGET_ADD_SHADERS_DEPENDS} ${PROJECT_SOURCE_DIR}/cmake/CaptureFxcDeps.py
|
||||
COMMENT "Building Shader ${FILE_WE}"
|
||||
|
|
@ -68,7 +68,7 @@ function(target_add_shaders)
|
|||
# DEPFILE argument is not compatible with non-Ninja generators
|
||||
add_custom_command(
|
||||
OUTPUT ${FX_HEADER}
|
||||
COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/cmake/CaptureFxcDeps.py --prefix ${PROJECT_BINARY_DIR} --depfile ${DEPFILE} --outputs ${FX_HEADER} --fxc ${FXC} ${FXC_FLAGS} /E"CSMain" /T cs_5_0 /Fh ${FX_HEADER} /Vn ${FILE_WE} ${FILE}
|
||||
COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/cmake/CaptureFxcDeps.py --prefix ${PROJECT_BINARY_DIR} --depfile ${DEPFILE} --outputs ${FX_HEADER} --fxc ${FXC} ${FXC_FLAGS} /E"CSMain" /T cs_5_0 /Fh ${FX_HEADER} /Vn ${FILE_WE} ${FILE}
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
DEPENDS ${FILE} ${TARGET_ADD_SHADERS_DEPENDS} ${PROJECT_SOURCE_DIR}/cmake/CaptureFxcDeps.py
|
||||
COMMENT "Building Shader ${FILE_WE}"
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче