mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-02 20:29:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'FindPython-fix-tests-failures'

Browse Source 
2549dc7c93 FindPython: Enable C language in tests that find the Development component

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5344
This commit is contained in:
Brad King
2020-10-08 12:07:59 +00:00
committed by Kitware Robot
parent 75a486f8c0 2549dc7c93
commit ef889ede4c
11 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab/ci/configure_fedora31_makefiles.cmake
+3 -4
View File
@@ -44,10 +44,9 @@ set(CMake_TEST_FindPatch "ON" CACHE BOOL "")
set(CMake_TEST_FindPNG "ON" CACHE BOOL "")
set(CMake_TEST_FindPostgreSQL "ON" CACHE BOOL "")
set(CMake_TEST_FindProtobuf "ON" CACHE BOOL "")
#FIXME: Not all FindPython tests pass on Fedora!
#set(CMake_TEST_FindPython "ON" CACHE BOOL "")
#set(CMake_TEST_FindPython_NumPy "ON" CACHE BOOL "")
#set(CMake_TEST_FindPython_PyPy "ON" CACHE BOOL "")
set(CMake_TEST_FindPython "ON" CACHE BOOL "")
set(CMake_TEST_FindPython_NumPy "ON" CACHE BOOL "")
set(CMake_TEST_FindPython_PyPy "ON" CACHE BOOL "")
set(CMake_TEST_FindRuby "ON" CACHE BOOL "")
set(CMake_TEST_FindRuby_RVM "ON" CACHE BOOL "")
set(CMake_TEST_FindSDL "ON" CACHE BOOL "")
Tests/FindPython/ArtifactsInteractive/CMakeLists.txt
+1 -1
View File
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.1)
project(TestArtifactsInteractive LANGUAGES NONE)
project(TestArtifactsInteractive LANGUAGES C)
set (components Interpreter Development)
if (CMake_TEST_FindPython_NumPy)
Tests/FindPython/ExactVersion/CMakeLists.txt
+1 -1
View File
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.1)
project(TestExactVersion LANGUAGES NONE)
project(TestExactVersion LANGUAGES C)
find_package(Python${Python_MAJOR_VERSION} ${Python_REQUESTED_VERSION} COMPONENTS Interpreter Development)
if(NOT Python${Python_MAJOR_VERSION}_FOUND)
Tests/FindPython/NumPy/CMakeLists.txt
+1 -1
View File
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.1)
project(TestNumPy C)
project(TestNumPy LANGUAGES C)
find_package (Python2 REQUIRED COMPONENTS Interpreter Development NumPy)
find_package (Python3 REQUIRED COMPONENTS Interpreter Development NumPy)
Tests/FindPython/NumPyOnly/CMakeLists.txt
+1 -1
View File
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.1)
project(TestNumPyOnly C)
project(TestNumPyOnly LANGUAGES C)
find_package(Python2 REQUIRED COMPONENTS NumPy)
find_package(Python3 REQUIRED COMPONENTS NumPy)
Tests/FindPython/PyPy/CMakeLists.txt
+1 -1
View File
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.1)
project(TestPyPy LANGUAGES NONE)
project(TestPyPy LANGUAGES C)
set (Python_FIND_IMPLEMENTATIONS PyPy)
Tests/FindPython/PyPy2/CMakeLists.txt
+1 -1
View File
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.1)
project(TestPyPy2 LANGUAGES NONE)
project(TestPyPy2 LANGUAGES C)
set (Python2_FIND_IMPLEMENTATIONS "PyPy")
Tests/FindPython/PyPy3/CMakeLists.txt
+1 -1
View File
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.1)
project(TestPyPy3 LANGUAGES NONE)
project(TestPyPy3 LANGUAGES C)
set (Python3_FIND_IMPLEMENTATIONS "PyPy")
Tests/FindPython/RequiredArtifacts/CMakeLists.txt
+1 -1
View File
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.1)
project(TestRequiredArtifacts LANGUAGES NONE)
project(TestRequiredArtifacts LANGUAGES C)
include(CTest)
Tests/FindPython/RequiredArtifacts/Check/CMakeLists.txt
+1 -1
View File
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.1)
project(TestRequiredArtifacts.Check LANGUAGES NONE)
project(TestRequiredArtifacts.Check LANGUAGES C)
set (components)
if (CHECK_INTERPRETER)
Tests/FindPython/VersionRange/CMakeLists.txt
+1 -1
View File
@@ -1,6 +1,6 @@
cmake_minimum_required (VERSION 3.18...3.19)
project (TestVersionRange LANGUAGES NONE)
project (TestVersionRange LANGUAGES C)
find_package (${Python} ${Python_REQUESTED_VERSION} EXACT COMPONENTS Interpreter)