From 6a0dff050ceda4ddfbf616e3f0ce698e0cc57208 Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 23 Mar 2021 12:24:54 +0000 Subject: [PATCH] Try to unbreak broken android cmake flags * cmake's built in platforms/Android.cmake for some reason sets CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH to OFF which prevents any subsequent find_program or find_package from locating any executables in the system PATH. This can break finding java among other things. --- renderdoccmd/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/renderdoccmd/CMakeLists.txt b/renderdoccmd/CMakeLists.txt index 54e04b4ef..bfa10de74 100644 --- a/renderdoccmd/CMakeLists.txt +++ b/renderdoccmd/CMakeLists.txt @@ -66,6 +66,10 @@ target_link_libraries(renderdoccmd ${libraries}) install (TARGETS renderdoccmd DESTINATION bin) if(ANDROID) + # Android sets this to off becuase Android is always terrible forever. + # It breaks finding java in the path, so enable it again + set(CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH ON) + ############################# # We need to check that 'java' in PATH is new enough. Temporarily unset the JAVA_HOME env, # then invoke FindJava.cmake which will search just the PATH, then re-set it.