mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 05:40:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

FindPython: add sub-components to Development component

Browse Source 
Fixes: #20425
This commit is contained in:
Marc Chevrier
2020-04-15 15:55:50 +02:00
parent bec1c211d9
commit c1b4044d3e
13 changed files with 452 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Tests/FindPython/CMakeLists.txt
View File

@@ -20,6 +20,17 @@ if(CMake_TEST_FindPython)
--test-command ${CMAKE_CTEST_COMMAND} -V -C $<CONFIGURATION>
)
add_test(NAME FindPython.Python2.Development.Module COMMAND
${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION>
--build-and-test
"${CMake_SOURCE_DIR}/Tests/FindPython/Python2Module"
"${CMake_BINARY_DIR}/Tests/FindPython/Python2Module"
${build_generator_args}
--build-project TestPython2Module
--build-options ${build_options}
--test-command ${CMAKE_CTEST_COMMAND} -V -C $<CONFIGURATION>
)
add_test(NAME FindPython.Python2Fail COMMAND
${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION>
--build-and-test
@@ -54,6 +65,17 @@ if(CMake_TEST_FindPython)
--test-command ${CMAKE_CTEST_COMMAND} -V -C $<CONFIGURATION>
)
add_test(NAME FindPython.Python3.Development.Module COMMAND
${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION>
--build-and-test
"${CMake_SOURCE_DIR}/Tests/FindPython/Python3Module"
"${CMake_BINARY_DIR}/Tests/FindPython/Python3Module"
${build_generator_args}
--build-project TestPython3Module
--build-options ${build_options}
--test-command ${CMAKE_CTEST_COMMAND} -V -C $<CONFIGURATION>
)
add_test(NAME FindPython.Python3Fail COMMAND
${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION>
--build-and-test
@@ -276,7 +298,6 @@ if(CMake_TEST_FindPython_NumPy)
${build_generator_args}
--build-project TestNumPyOnly
--build-options ${build_options}
--test-command ${CMAKE_CTEST_COMMAND} -V -C $<CONFIGURATION>
)
endif()

6
Tests/FindPython/Python/CMakeLists.txt
View File

@@ -8,6 +8,12 @@ find_package(Python ${Python_REQUESTED_VERSION} REQUIRED COMPONENTS Interpreter
if (NOT Python_FOUND)
message (FATAL_ERROR "Fail to found Python ${Python_REQUESTED_VERSION}")
endif()
if (NOT Python_Development.Module_FOUND)
message (FATAL_ERROR "Fail to found Python ${Python_REQUESTED_VERSION}, COMPONENT 'Development.Module'")
endif()
if (NOT Python_Development.Embed_FOUND)
message (FATAL_ERROR "Fail to found Python ${Python_REQUESTED_VERSION}, COMPOENENT 'Development.Embed'")
endif()
if(NOT TARGET Python::Interpreter)
message(SEND_ERROR "Python::Interpreter not found")

9
Tests/FindPython/Python2/CMakeLists.txt
View File

@@ -13,6 +13,15 @@ find_package(Python2 REQUIRED COMPONENTS Interpreter Development)
if (NOT Python2_FOUND)
message (FATAL_ERROR "Fail to found Python 2")
endif()
if (NOT Python2_Development_FOUND)
message (FATAL_ERROR "Fail to found Python 2 'Development' component")
endif()
if (NOT Python2_Development.Module_FOUND)
message (FATAL_ERROR "Fail to found Python 2 'Development.Module' component")
endif()
if (NOT Python2_Development.Embed_FOUND)
message (FATAL_ERROR "Fail to found Python 2 'Development.Embed' component")
endif()
if(NOT TARGET Python2::Interpreter)
message(SEND_ERROR "Python2::Interpreter not found")

15
Tests/FindPython/Python2Embedded/CMakeLists.txt
View File

@@ -4,10 +4,23 @@ project(TestPython2Embedded C)
include(CTest)
find_package(Python2 REQUIRED COMPONENTS Development)
find_package(Python2 REQUIRED COMPONENTS Development.Embed)
if (NOT Python2_FOUND)
message (FATAL_ERROR "Fail to found Python 2")
endif()
if (Python2_Development_FOUND)
message (FATAL_ERROR "Python 2, COMPONENT 'Development' unexpectedly found")
endif()
if (Python2_Development.Module_FOUND)
message (FATAL_ERROR "Python 2, COMPONENT 'Development.Module' unexpectedly found")
endif()
if (NOT Python2_Development.Embed_FOUND)
message (FATAL_ERROR "Python 2, COMPONENT 'Development.Embed' not found")
endif()
if(TARGET Python2::Module)
message(SEND_ERROR "Python2::Module unexpectedly found")
endif()
if(NOT TARGET Python2::Python)
message(SEND_ERROR "Python2::Python not found")

37
Tests/FindPython/Python2Module/CMakeLists.txt Normal file
View File

@@ -0,0 +1,37 @@
cmake_minimum_required(VERSION 3.1)
project(TestPython2Module C)
include(CTest)
find_package(Python2 REQUIRED COMPONENTS Interpreter Development.Module)
if (NOT Python2_FOUND)
message (FATAL_ERROR "Fail to found Python 2")
endif()
if (Python2_Development_FOUND)
message (FATAL_ERROR "Python 2, COMPONENT 'Development' unexpectedly found")
endif()
if (Python2_Development.Embed_FOUND)
message (FATAL_ERROR "Python 2, COMPONENT 'Development.Embed' unexpectedly found")
endif()
if (NOT Python2_Development.Module_FOUND)
message (FATAL_ERROR "Python 2, COMPONENT 'Development.Module' not found")
endif()
if(NOT TARGET Python2::Interpreter)
message(SEND_ERROR "Python2::Interpreter not found")
endif()
if(TARGET Python2::Python)
message(SEND_ERROR "Python2::Python unexpectedly found")
endif()
if(NOT TARGET Python2::Module)
message(SEND_ERROR "Python2::Module not found")
endif()
Python2_add_library (spam2 MODULE ../spam.c)
target_compile_definitions (spam2 PRIVATE PYTHON2)
add_test (NAME python2_spam2
COMMAND "${CMAKE_COMMAND}" -E env "PYTHONPATH=$<TARGET_FILE_DIR:spam2>"
"${Python2_EXECUTABLE}" -c "import spam2; spam2.system(\"cd\")")

9
Tests/FindPython/Python3/CMakeLists.txt
View File

@@ -13,6 +13,15 @@ find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
if (NOT Python3_FOUND)
message (FATAL_ERROR "Fail to found Python 3")
endif()
if (NOT Python3_Development_FOUND)
message (FATAL_ERROR "Fail to found Python 3 'Development' component")
endif()
if (NOT Python3_Development.Module_FOUND)
message (FATAL_ERROR "Fail to found Python 3 'Development.Module' component")
endif()
if (NOT Python3_Development.Embed_FOUND)
message (FATAL_ERROR "Fail to found Python 3 'Development.Embed' component")
endif()
if(NOT TARGET Python3::Interpreter)
message(SEND_ERROR "Python3::Interpreter not found")

15
Tests/FindPython/Python3Embedded/CMakeLists.txt
View File

@@ -4,10 +4,23 @@ project(TestPython3Embedded C)
include(CTest)
find_package(Python3 REQUIRED COMPONENTS Development)
find_package(Python3 REQUIRED COMPONENTS Development.Embed)
if (NOT Python3_FOUND)
message (FATAL_ERROR "Fail to found Python 3")
endif()
if (Python3_Development_FOUND)
message (FATAL_ERROR "Python 3, COMPONENT 'Development' unexpectedly found")
endif()
if (Python3_Development.Module_FOUND)
message (FATAL_ERROR "Python 3, COMPONENT 'Development.Module' unexpectedly found")
endif()
if (NOT Python3_Development.Embed_FOUND)
message (FATAL_ERROR "Python 3, COMPONENT 'Development.Embed' not found")
endif()
if(TARGET Python3::Module)
message(SEND_ERROR "Python3::Module unexpectedly found")
endif()
if(NOT TARGET Python3::Python)
message(SEND_ERROR "Python3::Python not found")

37
Tests/FindPython/Python3Module/CMakeLists.txt Normal file
View File

@@ -0,0 +1,37 @@
cmake_minimum_required(VERSION 3.1)
project(TestPython3Module C)
include(CTest)
find_package(Python3 REQUIRED COMPONENTS Interpreter Development.Module)
if (NOT Python3_FOUND)
message (FATAL_ERROR "Fail to found Python 3")
endif()
if (Python3_Development_FOUND)
message (FATAL_ERROR "Python 3, COMPONENT 'Development' unexpectedly found")
endif()
if (Python3_Development.Embed_FOUND)
message (FATAL_ERROR "Python 3, COMPONENT 'Development.Embed' unexpectedly found")
endif()
if (NOT Python3_Development.Module_FOUND)
message (FATAL_ERROR "Python 3, COMPONENT 'Development.Module' not found")
endif()
if(NOT TARGET Python3::Interpreter)
message(SEND_ERROR "Python3::Interpreter not found")
endif()
if(TARGET Python3::Python)
message(SEND_ERROR "Python3::Python unexpectedly found")
endif()
if(NOT TARGET Python3::Module)
message(SEND_ERROR "Python3::Module not found")
endif()
Python3_add_library (spam3 MODULE ../spam.c)
target_compile_definitions (spam3 PRIVATE PYTHON3)
add_test (NAME python3_spam3
COMMAND "${CMAKE_COMMAND}" -E env "PYTHONPATH=$<TARGET_FILE_DIR:spam3>"
"${Python3_EXECUTABLE}" -c "import spam3; spam3.system(\"cd\")")