[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-452-gec4d7d2

[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  ec4d7d2ff0b8442ed1f735376f22ea2ece1a9f8c (commit)
       via  08b9a0fdfa02f50e6ae2aeca1963e8f47d041dd2 (commit)
       via  ca4029fa9aada8e5d86eb81cc5ef9c7e9efe7715 (commit)
       via  2e242b5c1e6b24e4ed59692b9338e295b792f70e (commit)
       via  6699d46a2a7f12d35926def3e4db3c7a0a5f7449 (commit)
      from  b0ab3549ef8113079c1f2957977b389a3858ab3a (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=ec4d7d2ff0b8442ed1f735376f22ea2ece1a9f8c
commit ec4d7d2ff0b8442ed1f735376f22ea2ece1a9f8c
Merge: b0ab354 08b9a0f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 13 10:19:39 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 13 10:19:39 2016 -0400

    Merge topic 'FindBoost-minor-cleanup' into next
    
    08b9a0fd FindBoost: Simplify library dir detection with cascading if/elseif/else
    ca4029fa FindBoost: Minor style updates
    2e242b5c FindBoost: Use list(INSERT) to simplify suffix list generation
    6699d46a FindBoost: Use string(APPEND) in more cases


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=08b9a0fdfa02f50e6ae2aeca1963e8f47d041dd2
commit 08b9a0fdfa02f50e6ae2aeca1963e8f47d041dd2
Author:     Alex Turbov <i.zaufi at gmail.com>
AuthorDate: Thu Oct 13 15:17:53 2016 +0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 13 10:19:07 2016 -0400

    FindBoost: Simplify library dir detection with cascading if/elseif/else

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 6976038..9bd7a30 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -1681,13 +1681,11 @@ if(Boost_FOUND)
     endif()
 
     if(EXISTS "${_boost_LIB_DIR}/lib")
-      set(_boost_LIB_DIR ${_boost_LIB_DIR}/lib)
+      string(APPEND _boost_LIB_DIR /lib)
+    elseif(EXISTS "${_boost_LIB_DIR}/stage/lib")
+      string(APPEND _boost_LIB_DIR "/stage/lib")
     else()
-      if(EXISTS "${_boost_LIB_DIR}/stage/lib")
-        set(_boost_LIB_DIR ${_boost_LIB_DIR}/stage/lib)
-      else()
-        set(_boost_LIB_DIR "")
-      endif()
+      set(_boost_LIB_DIR "")
     endif()
 
     if(_boost_LIB_DIR AND EXISTS "${_boost_LIB_DIR}")

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ca4029fa9aada8e5d86eb81cc5ef9c7e9efe7715
commit ca4029fa9aada8e5d86eb81cc5ef9c7e9efe7715
Author:     Alex Turbov <i.zaufi at gmail.com>
AuthorDate: Thu Oct 13 15:17:53 2016 +0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 13 10:17:24 2016 -0400

    FindBoost: Minor style updates

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index fc68135..6976038 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -1392,7 +1392,7 @@ if( Boost_USE_STATIC_LIBS )
   if(WIN32)
     list(INSERT CMAKE_FIND_LIBRARY_SUFFIXES 0 .lib .a)
   else()
-    set(CMAKE_FIND_LIBRARY_SUFFIXES .a )
+    set(CMAKE_FIND_LIBRARY_SUFFIXES .a)
   endif()
 endif()
 
@@ -1418,7 +1418,7 @@ endif()
 set(_boost_STATIC_RUNTIME_WORKAROUND false)
 if(WIN32 AND Boost_USE_STATIC_LIBS)
   if(NOT DEFINED Boost_USE_STATIC_RUNTIME)
-    set(_boost_STATIC_RUNTIME_WORKAROUND true)
+    set(_boost_STATIC_RUNTIME_WORKAROUND TRUE)
   endif()
 endif()
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2e242b5c1e6b24e4ed59692b9338e295b792f70e
commit 2e242b5c1e6b24e4ed59692b9338e295b792f70e
Author:     Alex Turbov <i.zaufi at gmail.com>
AuthorDate: Thu Oct 13 15:17:53 2016 +0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 13 10:16:46 2016 -0400

    FindBoost: Use list(INSERT) to simplify suffix list generation

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 84ba061..fc68135 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -1390,7 +1390,7 @@ endif()
 if( Boost_USE_STATIC_LIBS )
   set( _boost_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
   if(WIN32)
-    set(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
+    list(INSERT CMAKE_FIND_LIBRARY_SUFFIXES 0 .lib .a)
   else()
     set(CMAKE_FIND_LIBRARY_SUFFIXES .a )
   endif()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6699d46a2a7f12d35926def3e4db3c7a0a5f7449
commit 6699d46a2a7f12d35926def3e4db3c7a0a5f7449
Author:     Alex Turbov <i.zaufi at gmail.com>
AuthorDate: Thu Oct 13 15:17:53 2016 +0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 13 10:15:34 2016 -0400

    FindBoost: Use string(APPEND) in more cases

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 184fb05..84ba061 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -1313,13 +1313,13 @@ string(APPEND _boost_DEBUG_ABI_TAG "d")
 #  p        using the STLport standard library rather than the
 #           default one supplied with your compiler
 if(Boost_USE_STLPORT)
-  set( _boost_RELEASE_ABI_TAG "${_boost_RELEASE_ABI_TAG}p")
-  set( _boost_DEBUG_ABI_TAG   "${_boost_DEBUG_ABI_TAG}p")
+  string(APPEND _boost_RELEASE_ABI_TAG "p")
+  string(APPEND _boost_DEBUG_ABI_TAG "p")
 endif()
 #  n        using the STLport deprecated "native iostreams" feature
 if(Boost_USE_STLPORT_DEPRECATED_NATIVE_IOSTREAMS)
-  set( _boost_RELEASE_ABI_TAG "${_boost_RELEASE_ABI_TAG}n")
-  set( _boost_DEBUG_ABI_TAG   "${_boost_DEBUG_ABI_TAG}n")
+  string(APPEND _boost_RELEASE_ABI_TAG "n")
+  string(APPEND _boost_DEBUG_ABI_TAG "n")
 endif()
 
 if(Boost_DEBUG)

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

Summary of changes:
 Modules/FindBoost.cmake |   24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
CMake