FindPython*: Manage weak link for Python modules

Add new target Python::Module which take care of platform requirements
for Python module development.

Fixes: #18100
This commit is contained in:
Marc Chevrier
2019-05-04 17:09:31 +02:00
parent 37bf503db2
commit 30b873c05d
21 changed files with 277 additions and 90 deletions

View File

@@ -79,6 +79,28 @@ if(CMake_TEST_FindPython)
--build-options ${build_options}
--test-command ${CMAKE_CTEST_COMMAND} -V -C $<CONFIGURATION>
)
add_test(NAME FindPython.Python2Embedded COMMAND
${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION>
--build-and-test
"${CMake_SOURCE_DIR}/Tests/FindPython/Python2Embedded"
"${CMake_BINARY_DIR}/Tests/FindPython/Python2Embedded"
${build_generator_args}
--build-project TestPython2Embedded
--build-options ${build_options}
--test-command ${CMAKE_CTEST_COMMAND} -V -C $<CONFIGURATION>
)
add_test(NAME FindPython.Python3Embedded COMMAND
${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION>
--build-and-test
"${CMake_SOURCE_DIR}/Tests/FindPython/Python3Embedded"
"${CMake_BINARY_DIR}/Tests/FindPython/Python3Embedded"
${build_generator_args}
--build-project TestPython3Embedded
--build-options ${build_options}
--test-command ${CMAKE_CTEST_COMMAND} -V -C $<CONFIGURATION>
)
endif()
if(CMake_TEST_FindPython_NumPy)

View File

@@ -16,6 +16,9 @@ endif()
if(NOT TARGET Python::Python)
message(SEND_ERROR "Python::Python not found")
endif()
if(NOT TARGET Python::Module)
message(SEND_ERROR "Python::Module not found")
endif()
Python_add_library (spam3 MODULE ../spam.c)
target_compile_definitions (spam3 PRIVATE PYTHON3)

View File

@@ -21,6 +21,9 @@ endif()
if(NOT TARGET Python2::Python)
message(SEND_ERROR "Python2::Python not 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)

View File

@@ -0,0 +1,29 @@
cmake_minimum_required(VERSION 3.1)
project(TestPython2Embedded C)
include(CTest)
find_package(Python2 REQUIRED COMPONENTS Development)
if (NOT Python2_FOUND)
message (FATAL_ERROR "Fail to found Python 2")
endif()
if(NOT TARGET Python2::Python)
message(SEND_ERROR "Python2::Python not found")
endif()
Python2_add_library (display_time2 SHARED ../display_time.c)
set_property (TARGET display_time2 PROPERTY WINDOWS_EXPORT_ALL_SYMBOLS ON)
target_compile_definitions (display_time2 PRIVATE PYTHON2)
add_executable (main2 ../main.c)
target_link_libraries (main2 PRIVATE display_time2)
if (WIN32 OR CYGWIN OR MSYS OR MINGW)
list (JOIN Python2_RUNTIME_LIBRARY_DIRS "$<SEMICOLON>" RUNTIME_DIRS)
add_test (NAME Python2.Embedded COMMAND "${CMAKE_COMMAND}" -E env "PATH=${RUNTIME_DIRS}" $<TARGET_FILE:main2>)
else()
add_test (NAME Python2.Embedded COMMAND main2)
endif()
set_property (TEST Python2.Embedded PROPERTY PASS_REGULAR_EXPRESSION "Today is")

View File

@@ -21,6 +21,9 @@ endif()
if(NOT TARGET Python3::Python)
message(SEND_ERROR "Python2::Python not found")
endif()
if(NOT TARGET Python3::Module)
message(SEND_ERROR "Python2::Module not found")
endif()
Python3_add_library (spam3 MODULE ../spam.c)
target_compile_definitions (spam3 PRIVATE PYTHON3)

View File

@@ -0,0 +1,29 @@
cmake_minimum_required(VERSION 3.1)
project(TestPython3Embedded C)
include(CTest)
find_package(Python3 REQUIRED COMPONENTS Development)
if (NOT Python3_FOUND)
message (FATAL_ERROR "Fail to found Python 3")
endif()
if(NOT TARGET Python3::Python)
message(SEND_ERROR "Python3::Python not found")
endif()
Python3_add_library (display_time3 SHARED ../display_time.c)
set_property (TARGET display_time3 PROPERTY WINDOWS_EXPORT_ALL_SYMBOLS ON)
target_compile_definitions (display_time3 PRIVATE PYTHON3)
add_executable (main3 ../main.c)
target_link_libraries (main3 PRIVATE display_time3)
if (WIN32 OR CYGWIN OR MSYS OR MINGW)
list (JOIN Python3_RUNTIME_LIBRARY_DIRS "$<SEMICOLON>" RUNTIME_DIRS)
add_test (NAME Python3.Embedded COMMAND "${CMAKE_COMMAND}" -E env "PATH=${RUNTIME_DIRS}" $<TARGET_FILE:main3>)
else()
add_test (NAME Python3.Embedded COMMAND main3)
endif()
set_property (TEST Python3.Embedded PROPERTY PASS_REGULAR_EXPRESSION "Today is")

View File

@@ -0,0 +1,36 @@
#include <stdio.h>
#define PY_SSIZE_T_CLEAN
#include <Python.h>
#include "display_time.h"
void display_time()
{
#if defined(PYTHON3)
wchar_t* program = Py_DecodeLocale("display_time", NULL);
if (program == NULL) {
fprintf(stderr, "Fatal error: cannot decode argv[0]\n");
exit(1);
}
char* cmd = "from time import time,ctime\n"
"print('Today is', ctime(time()))\n";
#else
char* program = "display_time";
char* cmd = "from time import time,ctime\n"
"print 'Today is', ctime(time())\n";
#endif
Py_SetProgramName(program); /* optional but recommended */
Py_Initialize();
PyRun_SimpleString(cmd);
#if defined(PYTHON3)
if (Py_FinalizeEx() < 0) {
exit(120);
}
PyMem_RawFree(program);
#else
Py_Finalize();
#endif
}

View File

@@ -0,0 +1,2 @@
void display_time();

7
Tests/FindPython/main.c Normal file
View File

@@ -0,0 +1,7 @@
#include "display_time.h"
int main()
{
display_time();
}