[Cmake-commits] CMake branch, next, updated. v2.8.6-2105-g91a2146

David Cole david.cole at kitware.com
Mon Dec 5 11:46:59 EST 2011


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  91a2146523c12683bb732b365ffadc9844e026ab (commit)
       via  f911bc94352888acc8cecb3e559fe3d3fba905b1 (commit)
      from  bf21aea45eaa1d714f21a18f232f61668cecae0a (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=91a2146523c12683bb732b365ffadc9844e026ab
commit 91a2146523c12683bb732b365ffadc9844e026ab
Merge: bf21aea f911bc9
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Dec 5 11:46:58 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 5 11:46:58 2011 -0500

    Merge topic 'findlapack-0012477' into next
    
    f911bc9 Revert "fixed: lapack static linkage (0012477)"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f911bc94352888acc8cecb3e559fe3d3fba905b1
commit f911bc94352888acc8cecb3e559fe3d3fba905b1
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Dec 5 11:39:31 2011 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Mon Dec 5 11:39:31 2011 -0500

    Revert "fixed: lapack static linkage (0012477)"
    
    This reverts commit 810675b3080db3f7dd4edc688106c8c769bbc107.

diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake
index e1d1202..bccf789 100644
--- a/Modules/FindLAPACK.cmake
+++ b/Modules/FindLAPACK.cmake
@@ -106,7 +106,7 @@ endforeach(_library ${_list})
 if(_libraries_work)
   # Test this combination of libraries.
   if(UNIX AND BLA_STATIC)
-    set(CMAKE_REQUIRED_LIBRARIES ${_flags} "-Wl,--start-group ${${LIBRARIES}} ${_blas} -Wl,--end-group" ${_threads})
+    set(CMAKE_REQUIRED_LIBRARIES ${_flags} "-Wl,--start-group ${${LIBRARIES}} ${_blas};-Wl,--end-group" ${_threads})
   else(UNIX AND BLA_STATIC)
     set(CMAKE_REQUIRED_LIBRARIES ${_flags} ${${LIBRARIES}} ${_blas} ${_threads})
   endif(UNIX AND BLA_STATIC)

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

Summary of changes:
 Modules/FindLAPACK.cmake |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list