Changeset: b3a230889900 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b3a230889900
Modified Files:
CMakeLists.txt
Branch: cmake-fun
Log Message:
Use FindPython3 only on 3.12 versions up.
The previous solution was buggy for 3.11.x versions.
diffs (23 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -271,9 +271,7 @@ set(PATH_SEP "'${OS_PATHSEP}'")
set(SO_EXT "${CMAKE_SHARED_LIBRARY_SUFFIX}")
# We need python3 for the testweb, python udfs and c udfs compilation
-if(CMAKE_VERSION VERSION_GREATER 3.11)
- find_package(Python3 COMPONENTS Interpreter Development)
-else()
+if(CMAKE_VERSION VERSION_LESS 3.12)
set(Python_ADDITIONAL_VERSIONS 3)
find_package(PythonInterp 3)
find_package(PythonLibs 3)
@@ -289,6 +287,8 @@ else()
set(Python3_INCLUDE_DIRS "${PYTHON_INCLUDE_DIRS}")
set(Python3_LIBRARIES "${PYTHON_LIBRARIES}")
endif()
+else()
+ find_package(Python3 COMPONENTS Interpreter Development)
endif()
if(Python3_Interpreter_FOUND)
set(PYTHON3_REQUIRED_VERSION "3.4")
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
