From 1c866dff7802efc43e50c09289f6bdc883f2156a Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Sun, 10 Nov 2019 18:24:36 -0700 Subject: [PATCH] CMake: Don't override Python_ROOT --- dtool/Package.cmake | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dtool/Package.cmake b/dtool/Package.cmake index 30250382c2..6f3bc82a1c 100644 --- a/dtool/Package.cmake +++ b/dtool/Package.cmake @@ -22,14 +22,17 @@ if(THIRDPARTY_DIRECTORY) if(CMAKE_SIZEOF_VOID_P EQUAL 8) set(_package_dir "${THIRDPARTY_DIRECTORY}/win-libs-vc14-x64") - file(GLOB Python_ROOT "${THIRDPARTY_DIRECTORY}/win-python*-x64") + file(GLOB _python_dirs "${THIRDPARTY_DIRECTORY}/win-python*-x64") else() set(_package_dir "${THIRDPARTY_DIRECTORY}/win-libs-vc14") - file(GLOB Python_ROOT "${THIRDPARTY_DIRECTORY}/win-python*") + file(GLOB _python_dirs "${THIRDPARTY_DIRECTORY}/win-python*") endif() - list(REVERSE Python_ROOT) # Descending order of version + list(REVERSE _python_dirs) # Descending order of version + if(NOT DEFINED Python_ROOT) + set(Python_ROOT "${_python_dirs}") + endif() set(BISON_ROOT "${THIRDPARTY_DIRECTORY}/win-util") set(FLEX_ROOT "${THIRDPARTY_DIRECTORY}/win-util")