[Cmake-commits] CMake branch, next, updated. v2.8.7-2653-g29fe3cb
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 29fe3cbd7d5cb34465203abd4e27dcbe12103bd2 (commit)
via f19149270c0aae1799d4fefe221d1deaf5dd1bad (commit)
from 90e8fa5e9ab590ad7b77cc5eacbe3029f332f8bd (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=29fe3cbd7d5cb34465203abd4e27dcbe12103bd2
commit 29fe3cbd7d5cb34465203abd4e27dcbe12103bd2
Merge: 90e8fa5 f191492
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Thu Feb 16 12:35:39 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Feb 16 12:35:39 2012 -0500
Merge topic 'findlibrary-versioned-libraries' into next
f191492 another try for the versioned find_library test
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f19149270c0aae1799d4fefe221d1deaf5dd1bad
commit f19149270c0aae1799d4fefe221d1deaf5dd1bad
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Thu Feb 16 18:35:17 2012 +0100
Commit: Rolf Eike Beer e...@sf-mail.de
CommitDate: Thu Feb 16 18:35:17 2012 +0100
another try for the versioned find_library test
diff --git a/Tests/Complex/CMakeLists.txt b/Tests/Complex/CMakeLists.txt
index 518b475..40de212 100644
--- a/Tests/Complex/CMakeLists.txt
+++ b/Tests/Complex/CMakeLists.txt
@@ -199,7 +199,7 @@ CONFIGURE_FILE(
${Complex_SOURCE_DIR}/Library/dummy
${Complex_BINARY_DIR}/Library/dummylib.lib
COPYONLY IMMEDIATE)
-FOREACH (ext ${CMAKE_SHLIB_SUFFIX};.so;.a;.sl;so.2)
+FOREACH (ext ${CMAKE_SHLIB_SUFFIX};.so;.a;.sl;.so.2)
CONFIGURE_FILE(
${Complex_SOURCE_DIR}/Library/dummy
${Complex_BINARY_DIR}/Library/libdummylib${ext}
---
Summary of changes:
Tests/Complex/CMakeLists.txt |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.7-2660-gd8d31a6
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 d8d31a644abde62197ba3dad669420e87339a924 (commit) via f4f94f3b7f89f069725668c38d15ffe7526bfe45 (commit) from 9d5a3c5e673956e05bfd662bf6bdef2d29c9fe35 (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=d8d31a644abde62197ba3dad669420e87339a924 commit d8d31a644abde62197ba3dad669420e87339a924 Merge: 9d5a3c5 f4f94f3 Author: David Cole david.c...@kitware.com AuthorDate: Thu Feb 16 17:01:05 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu Feb 16 17:01:05 2012 -0500 Merge topic 'suppress-clang-warning' into next f4f94f3 CTestCustom: Suppress clang warning on the dashboard http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f4f94f3b7f89f069725668c38d15ffe7526bfe45 commit f4f94f3b7f89f069725668c38d15ffe7526bfe45 Author: David Cole david.c...@kitware.com AuthorDate: Thu Feb 16 16:03:27 2012 -0500 Commit: David Cole david.c...@kitware.com CommitDate: Thu Feb 16 16:03:27 2012 -0500 CTestCustom: Suppress clang warning on the dashboard argument unused during compilation -- well, thanks, but ... If somebody has a fix to eliminate this warning entirely, rather than simply suppressing it from our dashboard results, I'm all ears. diff --git a/CTestCustom.cmake.in b/CTestCustom.cmake.in index 1a46688..c36cee4 100644 --- a/CTestCustom.cmake.in +++ b/CTestCustom.cmake.in @@ -44,6 +44,7 @@ SET(CTEST_CUSTOM_WARNING_EXCEPTION cc-3968 CC: WARNING File.* # implicit truncation by static_cast ld: warning: directory not found for option .-(F|L) warning.*This version of Mac OS X is unsupported + clang.*: warning: argument unused during compilation: .-g # Ignore clang's summary warning, assuming prior text has matched some # other warning expression: --- Summary of changes: CTestCustom.cmake.in |1 + 1 files changed, 1 insertions(+), 0 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.7-2662-gf08963b
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 f08963bf9baf9312ec01ecb8f4eb57486c27083f (commit)
via 43118d04cbb08814fd98e87afeadcfb703277606 (commit)
from d8d31a644abde62197ba3dad669420e87339a924 (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=f08963bf9baf9312ec01ecb8f4eb57486c27083f
commit f08963bf9baf9312ec01ecb8f4eb57486c27083f
Merge: d8d31a6 43118d0
Author: Alexander Neundorf neund...@kde.org
AuthorDate: Thu Feb 16 17:39:44 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Feb 16 17:39:44 2012 -0500
Merge topic 'HandleTargetsInCMakeRequiredLibraries' into next
43118d0 CMakeExpandImportedTargets: add CONFIGURATION parameter
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=43118d04cbb08814fd98e87afeadcfb703277606
commit 43118d04cbb08814fd98e87afeadcfb703277606
Author: Alex Neundorf neund...@kde.org
AuthorDate: Thu Feb 16 23:35:43 2012 +0100
Commit: Alex Neundorf neund...@kde.org
CommitDate: Thu Feb 16 23:35:43 2012 +0100
CMakeExpandImportedTargets: add CONFIGURATION parameter
As pointed out by Brad, now that cmake_expand_imported_targets() is
more generic, hardcoding to use CMAKE_TRY_COMPILE_CONFIGURATION is not
a good idea. So add a CONFIGURATION parameter, which defaults to
CMAKE_CONFIGURATION_TYPES[0] (if set) or CMAKE_BUILD_TYPE otherwise.
Use this with ${CMAKE_TRY_COMPILE_CONFIGURATION} in all the Check*.cmake
files.
Alex
diff --git a/Modules/CMakeExpandImportedTargets.cmake
b/Modules/CMakeExpandImportedTargets.cmake
index 88dedeb..fba071a 100644
--- a/Modules/CMakeExpandImportedTargets.cmake
+++ b/Modules/CMakeExpandImportedTargets.cmake
@@ -1,13 +1,19 @@
-# CMAKE_EXPAND_IMPORTED_TARGETS(var LIBRARIES lib1 lib2...libN)
+# CMAKE_EXPAND_IMPORTED_TARGETS(var LIBRARIES lib1 lib2...libN
+# [CONFIGURATION config] )
#
# CMAKE_EXPAND_IMPORTED_TARGETS() takes a list of libraries and replaces
# all imported targets contained in this list with their actual file paths
# of the referenced libraries on disk, including the libraries from their
# link interfaces.
+# If a CONFIGURATION is given, it uses the respective configuration of the
+# imported targets if it exists. If no CONFIGURATION is given, it uses
+# the first configuration from ${CMAKE_CONFIGURATION_TYPES} if set, otherwise
+# ${CMAKE_BUILD_TYPE}.
# This macro is used by all Check*.cmake files which use
# TRY_COMPILE() or TRY_RUN() and support CMAKE_REQUIRED_LIBRARIES , so that
# these checks support imported targets in CMAKE_REQUIRED_LIBRARIES:
-#cmake_expand_imported_targets(expandedLibs LIBRARIES
${CMAKE_REQUIRED_LIBRARIES} )
+#cmake_expand_imported_targets(expandedLibs LIBRARIES
${CMAKE_REQUIRED_LIBRARIES}
+# CONFIGURATION
${CMAKE_TRY_COMPILE_CONFIGURATION} )
#=
@@ -24,16 +30,31 @@
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
+include(CMakeParseArguments)
-function(CMAKE_EXPAND_IMPORTED_TARGETS _RESULT _LIB)
+function(CMAKE_EXPAND_IMPORTED_TARGETS _RESULT )
- if(NOT ${_LIB} STREQUAL LIBRARIES)
- message(FATAL_ERROR cmake_expand_imported_targets() called with bad
second argument \${_LIB}\, expected keyword \LIBRARIES\.)
+ set(options )
+ set(oneValueArgs CONFIGURATION )
+ set(multiValueArgs LIBRARIES )
+
+ cmake_parse_arguments(CEIT ${options} ${oneValueArgs}
${multiValueArgs} ${ARGN})
+
+ if(CEIT_UNPARSED_ARGUMENTS)
+ message(FATAL_ERROR Unknown keywords given to
CMAKE_EXPAND_IMPORTED_TARGETS(): \${CEIT_UNPARSED_ARGUMENTS}\)
+ endif()
+
+ if(NOT CEIT_CONFIGURATION)
+ if(CMAKE_CONFIGURATION_TYPES)
+ list(GET CMAKE_CONFIGURATION_TYPES 0 CEIT_CONFIGURATION)
+ else()
+ set(CEIT_CONFIGURATION ${CMAKE_BUILD_TYPE})
+ endif()
endif()
# handle imported library targets
- set(_CCSR_REQ_LIBS ${ARGN})
+ set(_CCSR_REQ_LIBS ${CEIT_LIBRARIES})
set(_CHECK_FOR_IMPORTED_TARGETS TRUE)
set(_CCSR_LOOP_COUNTER 0)
@@ -61,7 +82,7 @@ function(CMAKE_EXPAND_IMPORTED_TARGETS _RESULT _LIB)
# if one of the imported configurations equals
${CMAKE_TRY_COMPILE_CONFIGURATION},
# use it, otherwise simply use the first one:
-list(FIND _importedConfigs ${CMAKE_TRY_COMPILE_CONFIGURATION}
_configIndexToUse)
+list(FIND _importedConfigs ${CEIT_CONFIGURATION}
_configIndexToUse)
[Cmake-commits] CMake branch, next, updated. v2.8.7-2668-gffdef87
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 ffdef8726313f88bcfc534f37a989db8c5b93c47 (commit)
via 4585e573b8dc0473bd1caf56da85d9f6e57f0d8f (commit)
from 4a5d20dd223fa0f831c1c077889032cb7782b0b0 (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=ffdef8726313f88bcfc534f37a989db8c5b93c47
commit ffdef8726313f88bcfc534f37a989db8c5b93c47
Merge: 4a5d20d 4585e57
Author: David Cole david.c...@kitware.com
AuthorDate: Thu Feb 16 18:05:14 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Feb 16 18:05:14 2012 -0500
Merge topic 'findblas-bugs' into next
4585e57 FindBLAS/FindLAPACK: Work with MKL version 10.3 (#12924, #12925)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4585e573b8dc0473bd1caf56da85d9f6e57f0d8f
commit 4585e573b8dc0473bd1caf56da85d9f6e57f0d8f
Author: Alexey Ozeritsky aozerit...@gmail.com
AuthorDate: Sun Feb 5 18:01:38 2012 +0400
Commit: David Cole david.c...@kitware.com
CommitDate: Thu Feb 16 18:03:08 2012 -0500
FindBLAS/FindLAPACK: Work with MKL version 10.3 (#12924, #12925)
diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake
index 9b76d90..9eadfd1 100644
--- a/Modules/FindBLAS.cmake
+++ b/Modules/FindBLAS.cmake
@@ -23,6 +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),
+## Intel10_64lp_seq (intel mkl v10 64 bit,sequential code, lp64 model),
## 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
@@ -85,6 +86,7 @@ if (NOT _libdir)
set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV
LD_LIBRARY_PATH)
endif ()
endif ()
+
foreach(_library ${_list})
set(_combined_name ${_combined_name}_${_library})
@@ -115,7 +117,7 @@ foreach(_library ${_list})
endforeach(_library ${_list})
if(_libraries_work)
# Test this combination of libraries.
- set(CMAKE_REQUIRED_LIBRARIES ${_flags} ${${LIBRARIES}} ${_threads})
+ set(CMAKE_REQUIRED_LIBRARIES ${_flags} ${${LIBRARIES}} ${_thread})
# message(DEBUG: CMAKE_REQUIRED_LIBRARIES = ${CMAKE_REQUIRED_LIBRARIES})
if (_CHECK_FORTRAN)
check_fortran_function_exists(${_name} ${_prefix}${_combined_name}_WORKS)
@@ -460,117 +462,99 @@ if (BLA_VENDOR MATCHES Intel* OR BLA_VENDOR STREQUAL
All)
else(BLAS_FIND_QUIETLY OR NOT BLAS_FIND_REQUIRED)
find_package(Threads REQUIRED)
endif(BLAS_FIND_QUIETLY OR NOT BLAS_FIND_REQUIRED)
- if (WIN32)
+
+ set(BLAS_SEARCH_LIBS )
+
if(BLA_F95)
-if(NOT BLAS95_LIBRARIES)
-check_fortran_libraries(
-BLAS95_LIBRARIES
-BLAS
-sgemm
-
-mkl_blas95;mkl_intel_c;mkl_intel_thread;mkl_core;libguide40
-
-)
-endif(NOT BLAS95_LIBRARIES)
- else(BLA_F95)
-if(NOT BLAS_LIBRARIES)
-check_fortran_libraries(
-BLAS_LIBRARIES
-BLAS
-SGEMM
-
-mkl_c_dll;mkl_intel_thread_dll;mkl_core_dll;libguide40
-
-)
-endif(NOT BLAS_LIBRARIES)
- endif(BLA_F95)
- else(WIN32)
- if (BLA_VENDOR STREQUAL Intel10_32 OR BLA_VENDOR STREQUAL All)
-if(BLA_F95)
- if(NOT BLAS95_LIBRARIES)
- check_fortran_libraries(
- BLAS95_LIBRARIES
- BLAS
- sgemm
-
- mkl_blas95;mkl_intel;mkl_intel_thread;mkl_core;guide
- ${CMAKE_THREAD_LIBS_INIT};${LM}
- )
- endif(NOT BLAS95_LIBRARIES)
-else(BLA_F95)
-if(NOT BLAS_LIBRARIES)
- check_fortran_libraries(
- BLAS_LIBRARIES
- BLAS
- sgemm
-
- mkl_intel;mkl_intel_thread;mkl_core;guide
- ${CMAKE_THREAD_LIBS_INIT}
- ${LM}
- )
- endif(NOT BLAS_LIBRARIES)
-endif(BLA_F95)
- endif (BLA_VENDOR STREQUAL Intel10_32 OR BLA_VENDOR STREQUAL All)
- if (BLA_VENDOR STREQUAL Intel10_64lp OR BLA_VENDOR STREQUAL All)
- if(BLA_F95)
-if(NOT BLAS95_LIBRARIES)
- check_fortran_libraries(
- BLAS95_LIBRARIES
- BLAS
- sgemm
-
- mkl_blas95;mkl_intel_lp64;mkl_intel_thread;mkl_core;guide
- ${CMAKE_THREAD_LIBS_INIT};${LM}
- )
-endif(NOT BLAS95_LIBRARIES)
- else(BLA_F95)
- if(NOT BLAS_LIBRARIES)
+set(BLAS_mkl_SEARCH_SYMBOL SGEMM)
+set(_LIBRARIES BLAS95_LIBRARIES)
+if (WIN32)
+ list(APPEND BLAS_SEARCH_LIBS
+mkl_blas95 mkl_intel_c mkl_intel_thread mkl_core libguide40)
+else (WIN32)
+ if (BLA_VENDOR STREQUAL Intel10_32 OR BLA_VENDOR STREQUAL All)
+list(APPEND BLAS_SEARCH_LIBS
+ mkl_blas95
[Cmake-commits] CMake branch, master, updated. v2.8.7-378-gd03606a
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, master has been updated via d03606a19cc05872baf23269ae8ec61d2e0719e8 (commit) from e2042b68d36e0881bfc00f926a275dda3d6cbc9d (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=d03606a19cc05872baf23269ae8ec61d2e0719e8 commit d03606a19cc05872baf23269ae8ec61d2e0719e8 Author: KWSys Robot kwro...@kitware.com AuthorDate: Fri Feb 17 00:05:08 2012 -0500 Commit: KWSys Robot kwro...@kitware.com CommitDate: Fri Feb 17 00:05:08 2012 -0500 KWSys Nightly Date Stamp diff --git a/Source/kwsys/kwsysDateStamp.cmake b/Source/kwsys/kwsysDateStamp.cmake index 1c285d0..c80c53f 100644 --- a/Source/kwsys/kwsysDateStamp.cmake +++ b/Source/kwsys/kwsysDateStamp.cmake @@ -18,4 +18,4 @@ SET(KWSYS_DATE_STAMP_YEAR 2012) SET(KWSYS_DATE_STAMP_MONTH 02) # KWSys version date day component. Format is DD. -SET(KWSYS_DATE_STAMP_DAY 16) +SET(KWSYS_DATE_STAMP_DAY 17) --- Summary of changes: Source/kwsys/kwsysDateStamp.cmake |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
