TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

CMake: Don't override Python_ROOT

Browse Source
This commit is contained in:
Sam Edwards 2019-11-10 18:24:36 -07:00
parent 9b7bcf2564
commit 1c866dff78
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dtool/Package.cmake
View File

@ -22,14 +22,17 @@ if(THIRDPARTY_DIRECTORY)
if(CMAKE_SIZEOF_VOID_P EQUAL 8) if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(_package_dir "${THIRDPARTY_DIRECTORY}/win-libs-vc14-x64") 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() else()
set(_package_dir "${THIRDPARTY_DIRECTORY}/win-libs-vc14") 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() 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(BISON_ROOT "${THIRDPARTY_DIRECTORY}/win-util")
set(FLEX_ROOT "${THIRDPARTY_DIRECTORY}/win-util") set(FLEX_ROOT "${THIRDPARTY_DIRECTORY}/win-util")