The open source OpenXR runtime
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

build: Move finding Python earlier, so it builds in Android Studio on Linux.

+13 -12
+13 -12
CMakeLists.txt
··· 26 26 check_ipo_supported(RESULT HAS_IPO) 27 27 endif() 28 28 29 + # Android SDK doesn't look for 3.8 and 3.9, which is what new distros ship with. 30 + set(Python_ADDITIONAL_VERSIONS 3.8 3.9) 31 + if(NOT CMAKE_VERSION VERSION_LESS 3.12) 32 + find_package(Python3 REQUIRED Interpreter) 33 + set(PYTHON_EXECUTABLE Python3::Interpreter) 34 + else() 35 + find_program(PYTHON_EXECUTABLE python3) 36 + if(PYTHON_EXECUTABLE MATCHES "WindowsApps") 37 + # If you hit this error, you will have to install Python 3 or try harder to tell CMake where it is. 38 + message(FATAL_ERROR "Found WindowsApps alias for Python. Make sure Python3 is installed, then choose 'Manage App Execution Aliases' in Start and disable the aliases for Python.") 39 + endif() 40 + endif() 41 + 29 42 # Redundant mention of version is required because module defaults to looking for 2.91-compatible, 30 43 # which the config file for a 3.x says it's not compatible with. 31 44 find_package(Eigen3 3 REQUIRED) ··· 56 69 message(STATUS "Could NOT find libLeap: (missing: /usr/local/lib/libLeap.so)") 57 70 endif() 58 71 59 - # Android SDK doesn't look for 3.8 and 3.9, which is what new distros ship with. 60 - set(Python_ADDITIONAL_VERSIONS 3.8 3.9) 61 - if(NOT CMAKE_VERSION VERSION_LESS 3.12) 62 - find_package(Python3 REQUIRED Interpreter) 63 - set(PYTHON_EXECUTABLE Python3::Interpreter) 64 - else() 65 - find_program(PYTHON_EXECUTABLE python3) 66 - if(PYTHON_EXECUTABLE MATCHES "WindowsApps") 67 - # If you hit this error, you will have to install Python 3 or try harder to tell CMake where it is. 68 - message(FATAL_ERROR "Found WindowsApps alias for Python. Make sure Python3 is installed, then choose 'Manage App Execution Aliases' in Start and disable the aliases for Python.") 69 - endif() 70 - endif() 71 72 72 73 add_library(xrt-pthreads INTERFACE) 73 74 if(WIN32)