diff options
| author | Brad King <brad.king@kitware.com> | 2021-09-17 13:33:21 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-09-17 13:33:44 (GMT) |
| commit | 1127b591ec9e7651b8d3939d5fdaca565dbec1dc (patch) | |
| tree | 718f58183bc9611cfa717bb991edf77046b2369b /Modules/Platform | |
| parent | 58ac1eaa701c75d5b7a9f06e732ea403208cc4b3 (diff) | |
| parent | 94f37767749a602d3471e7a1ee2772357a444385 (diff) | |
| download | CMake-1127b591ec9e7651b8d3939d5fdaca565dbec1dc.zip CMake-1127b591ec9e7651b8d3939d5fdaca565dbec1dc.tar.gz CMake-1127b591ec9e7651b8d3939d5fdaca565dbec1dc.tar.bz2 | |
Merge topic 'android-PATH' into release-3.21
94f3776774 Android: Restore searching PATH for executables
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6528
Diffstat (limited to 'Modules/Platform')
| -rw-r--r-- | Modules/Platform/Android-Initialize.cmake | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Modules/Platform/Android-Initialize.cmake b/Modules/Platform/Android-Initialize.cmake index 50f0620..63bc949 100644 --- a/Modules/Platform/Android-Initialize.cmake +++ b/Modules/Platform/Android-Initialize.cmake @@ -56,11 +56,6 @@ if(CMAKE_ANDROID_NDK_TOOLCHAIN_UNIFIED) set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) endif() - # Don't search paths in PATH environment variable. - if(NOT DEFINED CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH) - set(CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH OFF) - endif() - # Allows CMake to find headers in the architecture-specific include directories. set(CMAKE_LIBRARY_ARCHITECTURE "${CMAKE_ANDROID_ARCH_TRIPLE}") |