mirror of
https://github.com/baldurk/renderdoc.git
synced 2026-05-04 09:00:44 +00:00
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.
This commit is contained in:
@@ -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.
|
||||
|
||||
Reference in New Issue
Block a user