diff options
| author | Tor Egge <Tor.Egge@online.no> | 2022-08-17 10:54:28 +0200 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@online.no> | 2022-08-17 10:54:28 +0200 |
| commit | fde5c5eaea9aacdcaf9a618d8fc29cc6e6b00ce2 (patch) | |
| tree | 6fba59e07b9787452f7b2e7276773283a7545f90 /default_build_settings.cmake | |
| parent | 5f57dc00592552a29cdab9c535ff05b03db08a5b (diff) | |
Update java version for DEFAULT_JAVA_HOME.
Diffstat (limited to 'default_build_settings.cmake')
| -rw-r--r-- | default_build_settings.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index 009cd6d615e..f5afc5931ff 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -403,12 +403,12 @@ function(vespa_use_default_java_home) if (DEFINED JAVA_HOME) return() endif() - set(DEFAULT_JAVA_HOME "/usr/lib/jvm/java-11-openjdk") + set(DEFAULT_JAVA_HOME "/usr/lib/jvm/java-17-openjdk") if(APPLE) execute_process(COMMAND "/usr/libexec/java_home" OUTPUT_VARIABLE DEFAULT_JAVA_HOME) string(STRIP "${DEFAULT_JAVA_HOME}" DEFAULT_JAVA_HOME) - elseif(VESPA_OS_DISTRO STREQUAL "ubuntu") - set(DEFAULT_JAVA_HOME "/usr/lib/jvm/java-11-openjdk-amd64" PARENT_SCOPE) + elseif(VESPA_OS_DISTRO STREQUAL "ubuntu" OR VESPA_OS_DISTRO STREQUAL "debian") + set(DEFAULT_JAVA_HOME "/usr/lib/jvm/java-17-openjdk-amd64" PARENT_SCOPE) endif() if(COMMAND vespa_use_specific_java_home) vespa_use_specific_java_home() |