[Cmake-commits] CMake branch, next, updated. v3.7.2-2485-gbef58c6

[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  bef58c63926fdb86c63525bed0ea57ed40d9e529 (commit)
       via  88c4576be412c85c112976dcec51b3fb7905b618 (commit)
      from  c43228b1fe914035a93ceff23b91017122b5f1bc (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=bef58c63926fdb86c63525bed0ea57ed40d9e529
commit bef58c63926fdb86c63525bed0ea57ed40d9e529
Merge: c43228b 88c4576
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 1 13:48:34 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 1 13:48:34 2017 -0500

    Merge topic 'FindGSL-regex-fixup' into next
    
    88c4576b FindGSL: Fix gl_version.h extraction regex


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=88c4576be412c85c112976dcec51b3fb7905b618
commit 88c4576be412c85c112976dcec51b3fb7905b618
Author:     Igor Peschinskiy <igor.peschinskiy at gmail.com>
AuthorDate: Wed Feb 1 12:54:17 2017 +0300
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 1 13:47:37 2017 -0500

    FindGSL: Fix gl_version.h extraction regex
    
    Fix the regex to match versions with only two digits, such as `2.3`.

diff --git a/Modules/FindGSL.cmake b/Modules/FindGSL.cmake
index 446c3a8..76059b3 100644
--- a/Modules/FindGSL.cmake
+++ b/Modules/FindGSL.cmake
@@ -135,7 +135,7 @@ if( NOT GSL_VERSION )
   # 2. If gsl-config is not available, try looking in gsl/gsl_version.h
   if( NOT GSL_VERSION AND EXISTS "${GSL_INCLUDE_DIRS}/gsl/gsl_version.h" )
     file( STRINGS "${GSL_INCLUDE_DIRS}/gsl/gsl_version.h" gsl_version_h_contents REGEX "define GSL_VERSION" )
-    string( REGEX REPLACE ".*([0-9].[0-9][0-9]).*" "\\1" GSL_VERSION ${gsl_version_h_contents} )
+    string( REGEX REPLACE ".*([0-9]\\.[0-9][0-9]?).*" "\\1" GSL_VERSION ${gsl_version_h_contents} )
   endif()
 
   # might also try scraping the directory name for a regex match "gsl-X.X"

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

Summary of changes:
 Modules/FindGSL.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake