date:20110815

[Cmake-commits] CMake branch, next, updated. v2.8.5-1554-g6e5d786

2011-08-15 Thread Alexey Ozeritsky

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  6e5d7869eb78b26d35405857d5351b294e6303d5 (commit)
   via  d5e603026b9bfde90742483df322e0c168407fef (commit)
   via  af4c58b3bd92f69cce195c3e491d40071b8d0b08 (commit)
  from  553a4c956404dc0f53fb33b304b81922c9f7c089 (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=6e5d7869eb78b26d35405857d5351b294e6303d5
commit 6e5d7869eb78b26d35405857d5351b294e6303d5
Merge: 553a4c9 d5e6030
Author: Alexey Ozeritsky aozerit...@gmail.com
AuthorDate: Mon Aug 15 09:38:30 2011 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Aug 15 09:38:30 2011 -0400

Merge topic 'FindLAPACK_FindBLAS' into next

d5e6030 ACML-GPU supportede
af4c58b ACML-GPU supported


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d5e603026b9bfde90742483df322e0c168407fef
commit d5e603026b9bfde90742483df322e0c168407fef
Author: Alexey Ozeritsky aozerit...@gmail.com
AuthorDate: Sat Aug 13 18:50:57 2011 +0400
Commit: Alexey Ozeritsky aozerit...@gmail.com
CommitDate: Sat Aug 13 18:50:57 2011 +0400

ACML-GPU supportede

diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake
index 1219102..80fe867 100644
--- a/Modules/FindLAPACK.cmake
+++ b/Modules/FindLAPACK.cmake
@@ -165,11 +165,11 @@ endif (BLA_VENDOR STREQUAL Goto OR BLA_VENDOR STREQUAL 
All)
 
 
 #acml lapack
- if (BLA_VENDOR STREQUAL ACML OR BLA_VENDOR STREQUAL ACML_MP OR BLA_VENDOR 
STREQUAL All)
+ if (BLA_VENDOR STREQUAL ACML.* OR BLA_VENDOR STREQUAL All)
if (BLAS_LIBRARIES MATCHES .+acml.+)
  set (LAPACK_LIBRARIES ${BLAS_LIBRARIES})
endif ()
- endif (BLA_VENDOR STREQUAL ACML OR BLA_VENDOR STREQUAL ACML_MP OR 
BLA_VENDOR STREQUAL All)
+ endif ()
 
 # Apple LAPACK library?
 if (BLA_VENDOR STREQUAL Apple OR BLA_VENDOR STREQUAL All)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=af4c58b3bd92f69cce195c3e491d40071b8d0b08
commit af4c58b3bd92f69cce195c3e491d40071b8d0b08
Author: Alexey Ozeritsky aozerit...@gmail.com
AuthorDate: Sat Aug 13 17:02:15 2011 +0400
Commit: Alexey Ozeritsky aozerit...@gmail.com
CommitDate: Sat Aug 13 17:03:58 2011 +0400

ACML-GPU supported

diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake
index 4431778..7bad959 100644
--- a/Modules/FindBLAS.cmake
+++ b/Modules/FindBLAS.cmake
@@ -23,7 +23,7 @@
 ##
 ### List of vendors (BLA_VENDOR) valid in this module
 ##  Goto,ATLAS PhiPACK,CXML,DXML,SunPerf,SCSL,SGIMATH,IBMESSL,Intel10_32 
(intel mkl v10 32 bit),Intel10_64lp (intel mkl v10 64 bit,lp thread model, lp64 
model),
-##  Intel( older versions of mkl 32 and 64 bit), ACML,ACML_MP,Apple, NAS, 
Generic
+##  Intel( older versions of mkl 32 and 64 bit), ACML,ACML_MP,ACML_GPU,Apple, 
NAS, Generic
 # C/CXX should be enabled to use Intel mkl
 
 #=
@@ -57,7 +57,7 @@ else()
   endif(BLAS_FIND_REQUIRED)
 endif( )
 
-macro(Check_Fortran_Libraries LIBRARIES _prefix _name _flags _list _optional)
+macro(Check_Fortran_Libraries LIBRARIES _prefix _name _flags _list _thread)
 # This macro checks for the existence of the combination of fortran libraries
 # given by _list.  If the combination is found, this macro checks (using the
 # Check_Fortran_Function_Exists macro) whether can link against that library
@@ -69,8 +69,7 @@ macro(Check_Fortran_Libraries LIBRARIES _prefix _name _flags 
_list _optional)
 # N.B. _prefix is the prefix applied to the names of all cached variables that
 # are generated internally and marked advanced by this macro.
 
-list(GET _optional 0 _thread)
-list(GET _optional 1 _libdir)
+set(_libdir ${ARGN})
 
 set(_libraries_work TRUE)
 set(${LIBRARIES})
@@ -267,15 +266,24 @@ if (BLA_VENDOR STREQUAL IBMESSL OR BLA_VENDOR STREQUAL 
All)
 endif (BLA_VENDOR STREQUAL IBMESSL OR BLA_VENDOR STREQUAL All)
 
 #BLAS in acml library?
-if (BLA_VENDOR STREQUAL ACML OR BLA_VENDOR STREQUAL ACML_MP OR BLA_VENDOR 
STREQUAL All)
-# the patch from Chuck Atkins:
- if( ((_BLAS_VENDOR STREQUAL ACML) AND (NOT BLAS_ACML_LIB_DIRS)) OR
-((_BLAS_VENDOR STREQUAL ACML_MP) AND (NOT BLAS_ACML_MP_LIB_DIRS)) )
+if (BLA_VENDOR MATCHES ACML.* OR BLA_VENDOR STREQUAL All)
+ if( ((BLA_VENDOR STREQUAL ACML) AND (NOT BLAS_ACML_LIB_DIRS)) OR
+ ((BLA_VENDOR STREQUAL ACML_MP) AND (NOT BLAS_ACML_MP_LIB_DIRS)) OR
+ ((BLA_VENDOR STREQUAL ACML_GPU) AND (NOT BLAS_ACML_GPU_LIB_DIRS))
+   )
+   # try to find acml in standard paths
if( WIN32 )
 file( GLOB _ACML_ROOT C:/AMD/acml*/ACML-EULA.txt )
else()
 file( GLOB _ACML_ROOT /opt/acml*/ACML-EULA.txt )
endif()
+   if(

[Cmake-commits] CMake branch, next, updated. v2.8.5-1564-gf9239a2

2011-08-15 Thread Stephen Kelly

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  f9239a25c33d6b099d706645ffa3661a922d57fb (commit)
   via  1ae3365e9f4126688d57137648e190ca5f4ef8dc (commit)
   via  f4264960551d088d3a0f1eea3049d2d8ecfd285b (commit)
   via  f84c7db5928dcb4a46c3f8d51d910e4ad4367113 (commit)
   via  9672b332b15a0ba66b929e28fdac2f5d854d9b99 (commit)
  from  a118650aaf509cdf44ded0405c22203f47422c49 (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=f9239a25c33d6b099d706645ffa3661a922d57fb
commit f9239a25c33d6b099d706645ffa3661a922d57fb
Merge: a118650 1ae3365
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Mon Aug 15 19:24:43 2011 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Aug 15 19:24:43 2011 -0400

Merge topic 'generate_export_header' into next

1ae3365 Exclude PGI from exports and deprecated.
f426496 Exclude cygwin from the hidden visibility feature.
f84c7db Don't enable deprecated on old GCC
9672b33 Don't enable deprecated on HP.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ae3365e9f4126688d57137648e190ca5f4ef8dc
commit 1ae3365e9f4126688d57137648e190ca5f4ef8dc
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Aug 16 01:21:59 2011 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Aug 16 01:21:59 2011 +0200

Exclude PGI from exports and deprecated.

diff --git a/Modules/GenerateExportHeader.cmake 
b/Modules/GenerateExportHeader.cmake
index f73748c..7a4b6d3 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -149,7 +149,7 @@ macro(_test_compiler_hidden_visibility)
   # Exclude XL here because it misinterprets -fvisibility=hidden even though
   # the check_cxx_compiler_flag passes
   # http://www.cdash.org/CDash/testDetails.php?test=109109951build=1419259
-  if (NOT GCC_TOO_OLD AND NOT WIN32 AND NOT CYGWIN AND NOT 
${CMAKE_CXX_COMPILER_ID} MATCHES XL)
+  if (NOT GCC_TOO_OLD AND NOT WIN32 AND NOT CYGWIN AND NOT 
${CMAKE_CXX_COMPILER_ID} MATCHES XL AND NOT ${CMAKE_CXX_COMPILER_ID} 
MATCHES PGI)
 check_cxx_compiler_flag(-fvisibility=hidden COMPILER_HAS_HIDDEN_VISIBILITY)
 check_cxx_compiler_flag(-fvisibility-inlines-hidden 
COMPILER_HAS_HIDDEN_INLINE_VISIBILITY)
 option(USE_COMPILER_HIDDEN_VISIBILITY Use HIDDEN visibility support if 
available. ON)
@@ -158,7 +158,7 @@ macro(_test_compiler_hidden_visibility)
 endmacro()
 
 macro(_test_compiler_has_deprecated)
-  if(${CMAKE_CXX_COMPILER_ID} MATCHES Borland OR ${CMAKE_CXX_COMPILER_ID} 
MATCHES HP OR GCC_TOO_OLD)
+  if(${CMAKE_CXX_COMPILER_ID} MATCHES Borland OR ${CMAKE_CXX_COMPILER_ID} 
MATCHES HP OR GCC_TOO_OLD OR ${CMAKE_CXX_COMPILER_ID} MATCHES PGI)
 set(COMPILER_HAS_DEPRECATED  CACHE INTERNAL Compiler support for a 
deprecated attribute)
   else()
 _check_cxx_compiler_attribute(__attribute__((__deprecated__)) 
COMPILER_HAS_DEPRECATED_ATTR)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f4264960551d088d3a0f1eea3049d2d8ecfd285b
commit f4264960551d088d3a0f1eea3049d2d8ecfd285b
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Aug 16 01:19:37 2011 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Aug 16 01:19:37 2011 +0200

Exclude cygwin from the hidden visibility feature.

diff --git a/Modules/GenerateExportHeader.cmake 
b/Modules/GenerateExportHeader.cmake
index f3a1836..f73748c 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -149,7 +149,7 @@ macro(_test_compiler_hidden_visibility)
   # Exclude XL here because it misinterprets -fvisibility=hidden even though
   # the check_cxx_compiler_flag passes
   # http://www.cdash.org/CDash/testDetails.php?test=109109951build=1419259
-  if (NOT GCC_TOO_OLD AND NOT WIN32 AND NOT ${CMAKE_CXX_COMPILER_ID} MATCHES 
XL)
+  if (NOT GCC_TOO_OLD AND NOT WIN32 AND NOT CYGWIN AND NOT 
${CMAKE_CXX_COMPILER_ID} MATCHES XL)
 check_cxx_compiler_flag(-fvisibility=hidden COMPILER_HAS_HIDDEN_VISIBILITY)
 check_cxx_compiler_flag(-fvisibility-inlines-hidden 
COMPILER_HAS_HIDDEN_INLINE_VISIBILITY)
 option(USE_COMPILER_HIDDEN_VISIBILITY Use HIDDEN visibility support if 
available. ON)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f84c7db5928dcb4a46c3f8d51d910e4ad4367113
commit f84c7db5928dcb4a46c3f8d51d910e4ad4367113
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Aug 16 01:17:26 2011 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Aug 16 01:17:26 2011 +0200

Don't enable deprecated on old GCC

Hopefully a fix for

[Cmake-commits] CMake branch, next, updated. v2.8.5-1554-g6e5d786

[Cmake-commits] CMake branch, next, updated. v2.8.5-1564-gf9239a2

2 matches

Site Navigation

Mail list logo

Footer information