[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-499-gec6c9db

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  ec6c9db25ddf2ecc464f54c3dc666c93ed60d3dc (commit)
       via  7788db9c4ee673fda9181de656363884d790592a (commit)
      from  f0e2f9e063e08ab02a15d1ffbd3252984eec0845 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ec6c9db25ddf2ecc464f54c3dc666c93ed60d3dc
commit ec6c9db25ddf2ecc464f54c3dc666c93ed60d3dc
Merge: f0e2f9e 7788db9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 23 07:17:51 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 23 07:17:51 2017 -0500

    Merge topic 'cmake_m4_find_package_var_check' into next
    
    7788db9c cmake.m4: do not set _XXXFLAGS or _LIBS var if already set


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7788db9c4ee673fda9181de656363884d790592a
commit 7788db9c4ee673fda9181de656363884d790592a
Author:     John Donoghue <john.donoghue at ieee.org>
AuthorDate: Sun Feb 12 13:57:19 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 23 07:16:16 2017 -0500

    cmake.m4: do not set _XXXFLAGS or _LIBS var if already set
    
    * Auxiliary/cmake.m4 (CMAKE_FIND_PACKAGE): change var tests from -n to -z
      to check if var is already set before calling cmake
    
    Fixes: #14460, #16663

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
 

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake