diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2017-06-19 14:37:55 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2017-07-12 20:43:10 (GMT) |
commit | d4896f7c30650ebe1a7ce5b5f742491a7b78e677 (patch) | |
tree | 96f2508a908b04dddae96fa42d6809326396b238 /config/cmake/CMakeFindJavaCommon.cmake | |
parent | 0c34b0bdf7491e92c573df6875b821f799a3c289 (diff) | |
download | hdf5-d4896f7c30650ebe1a7ce5b5f742491a7b78e677.zip hdf5-d4896f7c30650ebe1a7ce5b5f742491a7b78e677.tar.gz hdf5-d4896f7c30650ebe1a7ce5b5f742491a7b78e677.tar.bz2 |
Synch with CMake master
Diffstat (limited to 'config/cmake/CMakeFindJavaCommon.cmake')
-rw-r--r-- | config/cmake/CMakeFindJavaCommon.cmake | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/config/cmake/CMakeFindJavaCommon.cmake b/config/cmake/CMakeFindJavaCommon.cmake index fe6ee82..eabb622 100644 --- a/config/cmake/CMakeFindJavaCommon.cmake +++ b/config/cmake/CMakeFindJavaCommon.cmake @@ -1,41 +1,30 @@ +# Distributed under the OSI-approved BSD 3-Clause License. See https://cmake.org/licensing for details. -#============================================================================= -# Copyright 2013-2014 Kitware, Inc. -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= -# (To distribute this file outside of CMake, substitute the full -# License text for the above reference.) # Do not include this module directly from code outside CMake! set(_JAVA_HOME "") if(JAVA_HOME AND IS_DIRECTORY "${JAVA_HOME}") set(_JAVA_HOME "${JAVA_HOME}") set(_JAVA_HOME_EXPLICIT 1) -else () +else() set(_ENV_JAVA_HOME "") if(DEFINED ENV{JAVA_HOME}) file(TO_CMAKE_PATH "$ENV{JAVA_HOME}" _ENV_JAVA_HOME) - endif () + endif() if(_ENV_JAVA_HOME AND IS_DIRECTORY "${_ENV_JAVA_HOME}") set(_JAVA_HOME "${_ENV_JAVA_HOME}") set(_JAVA_HOME_EXPLICIT 1) - else () + else() set(_CMD_JAVA_HOME "") if(APPLE AND EXISTS /usr/libexec/java_home) execute_process(COMMAND /usr/libexec/java_home OUTPUT_VARIABLE _CMD_JAVA_HOME OUTPUT_STRIP_TRAILING_WHITESPACE) - endif () + endif() if(_CMD_JAVA_HOME AND IS_DIRECTORY "${_CMD_JAVA_HOME}") set(_JAVA_HOME "${_CMD_JAVA_HOME}") set(_JAVA_HOME_EXPLICIT 0) - endif () + endif() unset(_CMD_JAVA_HOME) - endif () + endif() unset(_ENV_JAVA_HOME) -endif () +endif() |