diff options
| author | Alexander Dorokhine <adorokhine@google.com> | 2020-02-19 14:34:03 -0800 |
|---|---|---|
| committer | Alexander Dorokhine <adorokhine@google.com> | 2020-02-19 14:34:03 -0800 |
| commit | 64db8fbc54df5507fe46bebd666176bb24d50fd0 (patch) | |
| tree | 1fc161100c29dae451f06ad52f40ccf1262318ce /share/aclocal | |
| parent | 765ed90505028ff8d7debc6b8204f73c54d18c3d (diff) | |
| download | darwin-x86-64db8fbc54df5507fe46bebd666176bb24d50fd0.tar.gz | |
Upgrade cmake to 3.10.2cmake-master-dev
From http://go/ab/5078762
Bug: 149853706
Change-Id: I570636a6ae3ca935925ac36aeef6a2b3dfcf0c82
(cherry picked from commit 1d4c2556dbbf86c502cf70f3bf339612c0aa8577)
Diffstat (limited to 'share/aclocal')
| -rw-r--r-- | share/aclocal/cmake.m4 | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/share/aclocal/cmake.m4 b/share/aclocal/cmake.m4 index a374a3b..7beff41 100644 --- a/share/aclocal/cmake.m4 +++ b/share/aclocal/cmake.m4 @@ -1,14 +1,5 @@ -dnl ============================================================================ -dnl CMake - Cross Platform Makefile Generator -dnl Copyright 2011 Matthias Kretz, kretz@kde.org -dnl -dnl Distributed under the OSI-approved BSD License (the "License"); -dnl see accompanying file Copyright.txt for details. -dnl -dnl This software is distributed WITHOUT ANY WARRANTY; without even the -dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -dnl See the License for more information. -dnl ============================================================================ +dnl Distributed under the OSI-approved BSD 3-Clause License. See accompanying +dnl file Copyright.txt or https://cmake.org/licensing for details. AC_DEFUN([CMAKE_FIND_BINARY], [AC_ARG_VAR([CMAKE_BINARY], [path to the cmake binary])dnl @@ -33,10 +24,10 @@ AC_ARG_VAR([$1][_LIBS], [linker flags for $1. This overrides the cmake output])d failed=false AC_MSG_CHECKING([for $1]) -if test -n "$1[]_$2[]FLAGS"; then +if test -z "${$1[]_$2[]FLAGS}"; then $1[]_$2[]FLAGS=`$CMAKE_BINARY --find-package "-DNAME=$1" "-DCOMPILER_ID=m4_default([$3], [GNU])" "-DLANGUAGE=$2" -DMODE=COMPILE $4` || failed=true fi -if test -n "$1[]_LIBS"; then +if test -z "${$1[]_LIBS}"; then $1[]_LIBS=`$CMAKE_BINARY --find-package "-DNAME=$1" "-DCOMPILER_ID=m4_default([$3], [GNU])" "-DLANGUAGE=$2" -DMODE=LINK $4` || failed=true fi |