diff options
| author | Brad King <brad.king@kitware.com> | 2017-02-23 12:35:26 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2017-02-23 12:35:26 (GMT) |
| commit | e2717d69df8eee036cfa5be431e019e117b94efe (patch) | |
| tree | f4d6514d0cd0dd6cd9c7652e0f3333f0b88ba9d2 | |
| parent | 77cbcb76bb5d75254c6ced0ed782152024f51d8c (diff) | |
| parent | 7788db9c4ee673fda9181de656363884d790592a (diff) | |
| download | CMake-e2717d69df8eee036cfa5be431e019e117b94efe.zip CMake-e2717d69df8eee036cfa5be431e019e117b94efe.tar.gz CMake-e2717d69df8eee036cfa5be431e019e117b94efe.tar.bz2 | |
Merge topic 'cmake_m4_find_package_var_check'
7788db9c cmake.m4: do not set _XXXFLAGS or _LIBS var if already set
| -rw-r--r-- | Auxiliary/cmake.m4 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Auxiliary/cmake.m4 b/Auxiliary/cmake.m4 index 3ef4c16..7beff41 100644 --- a/Auxiliary/cmake.m4 +++ b/Auxiliary/cmake.m4 @@ -24,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 |