[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2235-g05f3537
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 05f3537f1b4ae9c1f2008c6e9d412990f2b48ae0 (commit)
via 6ad2b22a5508af5f4aa8c82d3677cf19a7f59027 (commit)
from d34ceba47d9bf6b39ea9c8ed2dfabd9f2b5cb8c9 (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=05f3537f1b4ae9c1f2008c6e9d412990f2b48ae0
commit 05f3537f1b4ae9c1f2008c6e9d412990f2b48ae0
Merge: d34ceba 6ad2b22
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Feb 20 07:31:12 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Feb 20 07:31:12 2013 -0500
Merge topic 'interface-property-external-read' into next
6ad2b22 Fix the GeneratorExpression test reading INCLUDE_DIRECTORIES.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6ad2b22a5508af5f4aa8c82d3677cf19a7f59027
commit 6ad2b22a5508af5f4aa8c82d3677cf19a7f59027
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Feb 20 13:26:12 2013 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Wed Feb 20 13:26:12 2013 +0100
Fix the GeneratorExpression test reading INCLUDE_DIRECTORIES.
The test was incorrectly expecting only the direct includes, instead
of expecting the includes to be evaluated transitively via the link
interface.
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx
b/Source/cmGeneratorExpressionEvaluator.cxx
index b6a2c63..c294425 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -476,8 +476,22 @@ static const struct TargetPropertyNode : public
cmGeneratorExpressionNode
std::string linkedTargetsContent;
+std::string interfacePropertyName;
+
if (propertyName == INTERFACE_INCLUDE_DIRECTORIES
-|| propertyName == INTERFACE_COMPILE_DEFINITIONS)
+|| propertyName == INCLUDE_DIRECTORIES)
+ {
+ interfacePropertyName = INTERFACE_INCLUDE_DIRECTORIES;
+ }
+else if (propertyName == INTERFACE_COMPILE_DEFINITIONS
+|| propertyName == COMPILE_DEFINITIONS
+|| strncmp(propertyName.c_str(), COMPILE_DEFINITIONS_, 20) == 0)
+ {
+ interfacePropertyName = INTERFACE_COMPILE_DEFINITIONS;
+ }
+
+if (interfacePropertyName == INTERFACE_INCLUDE_DIRECTORIES
+|| interfacePropertyName == INTERFACE_COMPILE_DEFINITIONS)
{
const cmTarget::LinkInterface *iface = target-GetLinkInterface(
context-Config,
@@ -495,7 +509,8 @@ static const struct TargetPropertyNode : public
cmGeneratorExpressionNode
if (context-Makefile-FindTargetToUse(it-c_str()))
{
depString +=
- sep + $TARGET_PROPERTY: + *it + , + propertyName + ;
+ sep + $TARGET_PROPERTY: + *it + ,
+ + interfacePropertyName + ;
sep = ;;
}
}
@@ -550,7 +565,7 @@ static const struct TargetPropertyNode : public
cmGeneratorExpressionNode
sizeof(*targetPropertyTransitiveWhitelist));
++i)
{
- if (targetPropertyTransitiveWhitelist[i] == propertyName)
+ if (targetPropertyTransitiveWhitelist[i] == interfacePropertyName)
{
cmGeneratorExpression ge(context-Backtrace);
cmsys::auto_ptrcmCompiledGeneratorExpression cge = ge.Parse(prop);
diff --git a/Tests/GeneratorExpression/CMakeLists.txt
b/Tests/GeneratorExpression/CMakeLists.txt
index 75bf21a..8a64dc2 100644
--- a/Tests/GeneratorExpression/CMakeLists.txt
+++ b/Tests/GeneratorExpression/CMakeLists.txt
@@ -80,6 +80,9 @@ target_link_libraries(empty1 LINK_PUBLIC empty2)
target_link_libraries(empty2 LINK_PUBLIC empty3 empty4)
target_link_libraries(empty3 LINK_PUBLIC empty2 empty4)
+add_library(empty5 empty.cpp)
+target_include_directories(empty5 PRIVATE /empty5/private)
+
add_custom_target(check-part2 ALL
COMMAND ${CMAKE_COMMAND}
-Dtest_incomplete_1=$
@@ -114,6 +117,7 @@ add_custom_target(check-part2 ALL
-Dtest_target_includes5=$TARGET_PROPERTY:empty2,INCLUDE_DIRECTORIES
-Dtest_target_includes6=$TARGET_PROPERTY:empty3,INCLUDE_DIRECTORIES
-Dtest_target_includes7=$TARGET_PROPERTY:empty1,INTERFACE_INCLUDE_DIRECTORIES
+-Dtest_target_includes8=$TARGET_PROPERTY:empty5,INCLUDE_DIRECTORIES
-P ${CMAKE_CURRENT_SOURCE_DIR}/check-part2.cmake
COMMAND ${CMAKE_COMMAND} -E echo check done (part 2 of 2)
VERBATIM
diff --git a/Tests/GeneratorExpression/check-part2.cmake
b/Tests/GeneratorExpression/check-part2.cmake
index 2a5c9a1..177bace 100644
--- a/Tests/GeneratorExpression/check-part2.cmake
+++
[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2237-ga901685
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 a901685e9e6ef6db8ba6a60b0e6faba98282f92b (commit)
via e83e6a1c8c572548b2a8ce1e54f4fd0f60f32a70 (commit)
from 05f3537f1b4ae9c1f2008c6e9d412990f2b48ae0 (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=a901685e9e6ef6db8ba6a60b0e6faba98282f92b
commit a901685e9e6ef6db8ba6a60b0e6faba98282f92b
Merge: 05f3537 e83e6a1
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Feb 20 08:03:50 2013 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Feb 20 08:03:50 2013 -0500
Merge branch 'compiler-change-cleanup' into next
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e83e6a1c8c572548b2a8ce1e54f4fd0f60f32a70
commit e83e6a1c8c572548b2a8ce1e54f4fd0f60f32a70
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Feb 18 10:35:53 2013 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Feb 20 08:01:06 2013 -0500
Test Unix Makefiles generator support for changing compilers
Add RunCMake.CompilerChange test to cover use of -DCMAKE_C_COMPILER=cc
to change the compiler of an existing build tree. Also test for proper
failure with -DCMAKE_C_COMPILER= and no CC in the environment.
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 320ebcc..c55bb3a 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -52,6 +52,9 @@ if(XCODE_VERSION AND ${XCODE_VERSION} VERSION_LESS 3)
endif()
add_RunCMake_test(CMP0019)
+if(UNIX AND ${CMAKE_TEST_GENERATOR} MATCHES Unix Makefiles)
+ add_RunCMake_test(CompilerChange)
+endif()
add_RunCMake_test(ExternalData)
add_RunCMake_test(GeneratorExpression)
add_RunCMake_test(GeneratorToolset)
diff --git a/Tests/RunCMake/CompilerChange/CMakeLists.txt
b/Tests/RunCMake/CompilerChange/CMakeLists.txt
new file mode 100644
index 000..3b92518
--- /dev/null
+++ b/Tests/RunCMake/CompilerChange/CMakeLists.txt
@@ -0,0 +1,6 @@
+cmake_minimum_required(VERSION 2.8)
+if(NOT RunCMake_TEST)
+ set(RunCMake_TEST $ENV{RunCMake_TEST}) # needed when cache is deleted
+endif()
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/CompilerChange/EmptyCompiler-result.txt
b/Tests/RunCMake/CompilerChange/EmptyCompiler-result.txt
new file mode 100644
index 000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CompilerChange/EmptyCompiler-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CompilerChange/EmptyCompiler-stderr.txt
b/Tests/RunCMake/CompilerChange/EmptyCompiler-stderr.txt
new file mode 100644
index 000..4745b25
--- /dev/null
+++ b/Tests/RunCMake/CompilerChange/EmptyCompiler-stderr.txt
@@ -0,0 +1,5 @@
+You have changed variables that require your cache to be deleted.
+Configure will be re-run and you may have to reset some variables.
+The following variables have changed:
+CMAKE_C_COMPILER= *(
+|$)
diff --git a/Tests/RunCMake/CompilerChange/EmptyCompiler.cmake
b/Tests/RunCMake/CompilerChange/EmptyCompiler.cmake
new file mode 100644
index 000..c87ec49
--- /dev/null
+++ b/Tests/RunCMake/CompilerChange/EmptyCompiler.cmake
@@ -0,0 +1,3 @@
+enable_language(C)
+message(STATUS CMAKE_C_COMPILER is \${CMAKE_C_COMPILER}\)
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/cc.cmake set(CMAKE_C_COMPILER
\${CMAKE_C_COMPILER}\)\n)
diff --git a/Tests/RunCMake/CompilerChange/FindCompiler.cmake
b/Tests/RunCMake/CompilerChange/FindCompiler.cmake
new file mode 100644
index 000..297ab2f
--- /dev/null
+++ b/Tests/RunCMake/CompilerChange/FindCompiler.cmake
@@ -0,0 +1,2 @@
+enable_language(C)
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/cc.cmake set(CMAKE_C_COMPILER
\${CMAKE_C_COMPILER}\)\n)
diff --git a/Tests/RunCMake/CompilerChange/FirstCompiler-stdout.txt
b/Tests/RunCMake/CompilerChange/FirstCompiler-stdout.txt
new file mode 100644
index 000..17621b7
--- /dev/null
+++ b/Tests/RunCMake/CompilerChange/FirstCompiler-stdout.txt
@@ -0,0 +1 @@
+-- CMAKE_C_COMPILER is .*/Tests/RunCMake/CompilerChange/cc1.sh
diff --git a/Tests/RunCMake/CompilerChange/FirstCompiler.cmake
b/Tests/RunCMake/CompilerChange/FirstCompiler.cmake
new file mode 100644
index 000..c87ec49
--- /dev/null
+++ b/Tests/RunCMake/CompilerChange/FirstCompiler.cmake
@@ -0,0 +1,3 @@
+enable_language(C)
+message(STATUS CMAKE_C_COMPILER is \${CMAKE_C_COMPILER}\)
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/cc.cmake set(CMAKE_C_COMPILER
\${CMAKE_C_COMPILER}\)\n)
diff --git a/Tests/RunCMake/CompilerChange/RunCMakeTest.cmake
b/Tests/RunCMake/CompilerChange/RunCMakeTest.cmake
new file mode 100644
index 000..d383716
--- /dev/null
+++
[Cmake-commits] CMake branch, master, updated. v2.8.10.2-730-g414658f
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 414658f0572497fffcb865485f08cd2d26ce040f (commit) via f6a8983db4b67cde32b9ea88c91c65bb1ef82d6c (commit) via 0816caecac5b9e4b93ce17301e0aad2c7a9845e8 (commit) from 4515b09731856dc2713c567a48fec1374b317ece (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=414658f0572497fffcb865485f08cd2d26ce040f commit 414658f0572497fffcb865485f08cd2d26ce040f Merge: 4515b09 f6a8983 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Feb 20 08:09:17 2013 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Feb 20 08:09:17 2013 -0500 Merge topic 'xcode-organize-sources' f6a8983 Xcode: Sort source files 0816cae Xcode: Fix nested source group handling (#12943) --- Summary of changes: Source/cmGlobalXCodeGenerator.cxx | 15 +-- 1 files changed, 13 insertions(+), 2 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, master, updated. v2.8.10.2-732-g54d7746
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 54d77467e6e1e631c49e5dcb9518f7459a0b9aea (commit) via c26ac223df45d67fcd7de664856fe7abf98d7935 (commit) from 414658f0572497fffcb865485f08cd2d26ce040f (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=54d77467e6e1e631c49e5dcb9518f7459a0b9aea commit 54d77467e6e1e631c49e5dcb9518f7459a0b9aea Merge: 414658f c26ac22 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Feb 20 08:09:26 2013 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Feb 20 08:09:26 2013 -0500 Merge topic 'NAG-Fortran-PIC' c26ac22 NAG: Use -PIC for Fortran position-independent code (#13932) --- Summary of changes: Modules/Compiler/NAG-Fortran.cmake |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, master, updated. v2.8.10.2-734-gf1cd42f
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 f1cd42f8182946109f71fdd37956245c0d8cfb4f (commit) via bed6c388960749b9d93cbb3590896c6a663f83df (commit) from 54d77467e6e1e631c49e5dcb9518f7459a0b9aea (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=f1cd42f8182946109f71fdd37956245c0d8cfb4f commit f1cd42f8182946109f71fdd37956245c0d8cfb4f Merge: 54d7746 bed6c38 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Feb 20 08:09:34 2013 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Feb 20 08:09:34 2013 -0500 Merge topic 'ide-compiler-vars-cleanup' bed6c38 VS,Xcode: Remove unused CMAKE_GENERATOR_* variables --- Summary of changes: Source/cmGlobalVisualStudio6Generator.cxx |3 --- Source/cmGlobalVisualStudio7Generator.cxx |3 --- Source/cmGlobalXCodeGenerator.cxx |2 -- 3 files changed, 0 insertions(+), 8 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, master, updated. v2.8.10.2-739-gfc7b4d5
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 fc7b4d5cf320ca0c3b81be4e7163215d870342c4 (commit)
via e83e6a1c8c572548b2a8ce1e54f4fd0f60f32a70 (commit)
via c307e1c911dbbafb1673799212a4e5f4e211b9f8 (commit)
via 2963c9828ce5193334d60b38b051f1ce59bb3df3 (commit)
via 1df09e57732501454ac2bee900d2aad963a84969 (commit)
from f1cd42f8182946109f71fdd37956245c0d8cfb4f (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=fc7b4d5cf320ca0c3b81be4e7163215d870342c4
commit fc7b4d5cf320ca0c3b81be4e7163215d870342c4
Merge: f1cd42f e83e6a1
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Feb 20 08:09:40 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Feb 20 08:09:40 2013 -0500
Merge topic 'compiler-change-cleanup'
e83e6a1 Test Unix Makefiles generator support for changing compilers
c307e1c Tests/RunCMake: Allow tests to control build tree behavior
2963c98 Merge branch 'empty-compiler-crash' into compiler-change-cleanup
1df09e5 Delete entire CMakeFiles directory when deleting CMakeCache.txt
(#13756)
---
Summary of changes:
Source/cmCacheManager.cxx | 22 +++-
Tests/RunCMake/CMakeLists.txt |3 +
Tests/RunCMake/CompilerChange/CMakeLists.txt |6 ++
.../EmptyCompiler-result.txt} |0
.../CompilerChange/EmptyCompiler-stderr.txt|5 ++
Tests/RunCMake/CompilerChange/EmptyCompiler.cmake |3 +
Tests/RunCMake/CompilerChange/FindCompiler.cmake |2 +
.../CompilerChange/FirstCompiler-stdout.txt|1 +
Tests/RunCMake/CompilerChange/FirstCompiler.cmake |3 +
Tests/RunCMake/CompilerChange/RunCMakeTest.cmake | 58
.../CompilerChange/SecondCompiler-stderr.txt |4 ++
.../CompilerChange/SecondCompiler-stdout.txt |1 +
Tests/RunCMake/CompilerChange/SecondCompiler.cmake |3 +
Tests/RunCMake/CompilerChange/cc.sh.in |2 +
Tests/RunCMake/RunCMake.cmake |8 ++-
15 files changed, 104 insertions(+), 17 deletions(-)
create mode 100644 Tests/RunCMake/CompilerChange/CMakeLists.txt
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =
CompilerChange/EmptyCompiler-result.txt} (100%)
create mode 100644 Tests/RunCMake/CompilerChange/EmptyCompiler-stderr.txt
create mode 100644 Tests/RunCMake/CompilerChange/EmptyCompiler.cmake
create mode 100644 Tests/RunCMake/CompilerChange/FindCompiler.cmake
create mode 100644 Tests/RunCMake/CompilerChange/FirstCompiler-stdout.txt
create mode 100644 Tests/RunCMake/CompilerChange/FirstCompiler.cmake
create mode 100644 Tests/RunCMake/CompilerChange/RunCMakeTest.cmake
create mode 100644 Tests/RunCMake/CompilerChange/SecondCompiler-stderr.txt
create mode 100644 Tests/RunCMake/CompilerChange/SecondCompiler-stdout.txt
create mode 100644 Tests/RunCMake/CompilerChange/SecondCompiler.cmake
create mode 100755 Tests/RunCMake/CompilerChange/cc.sh.in
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, master, updated. v2.8.10.2-742-gf702957
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 f7029572ca5948ff87ba0c6e8aaff35f6fdab4f1 (commit) via b0051404510e8570b16615ed927a88d07c0ff4e8 (commit) via 781ea6d1ca03a11a40a92363e99637a6f20a6a69 (commit) from fc7b4d5cf320ca0c3b81be4e7163215d870342c4 (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=f7029572ca5948ff87ba0c6e8aaff35f6fdab4f1 commit f7029572ca5948ff87ba0c6e8aaff35f6fdab4f1 Merge: fc7b4d5 b005140 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Feb 20 08:09:47 2013 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Feb 20 08:09:47 2013 -0500 Merge topic 'xcode-target-depends' b005140 Xcode: Each target dependency edge needs a unique object (#13935) 781ea6d Xcode: Drop check for circular target dependencies --- Summary of changes: Source/cmGlobalXCodeGenerator.cxx | 60 +++- Source/cmXCodeObject.cxx |1 - Source/cmXCodeObject.h|9 - 3 files changed, 19 insertions(+), 51 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.10.2-2244-g3129fe1
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 3129fe173ed5c15465a8f5e7ff989500a4c5caee (commit) via f7029572ca5948ff87ba0c6e8aaff35f6fdab4f1 (commit) via fc7b4d5cf320ca0c3b81be4e7163215d870342c4 (commit) via f1cd42f8182946109f71fdd37956245c0d8cfb4f (commit) via 54d77467e6e1e631c49e5dcb9518f7459a0b9aea (commit) via 414658f0572497fffcb865485f08cd2d26ce040f (commit) via 4515b09731856dc2713c567a48fec1374b317ece (commit) from a901685e9e6ef6db8ba6a60b0e6faba98282f92b (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=3129fe173ed5c15465a8f5e7ff989500a4c5caee commit 3129fe173ed5c15465a8f5e7ff989500a4c5caee Merge: a901685 f702957 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Feb 20 08:14:39 2013 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Wed Feb 20 08:14:39 2013 -0500 Merge branch 'master' into next --- Summary of changes: Source/CMakeVersion.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
[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2246-gaaa9ccf
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 aaa9ccf325b386d8b500c0b95a2cac1409375d51 (commit)
via 6b987f9066b8d42c611769da596d5c4ba831d96f (commit)
from 3129fe173ed5c15465a8f5e7ff989500a4c5caee (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=aaa9ccf325b386d8b500c0b95a2cac1409375d51
commit aaa9ccf325b386d8b500c0b95a2cac1409375d51
Merge: 3129fe1 6b987f9
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Feb 20 09:12:57 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Feb 20 09:12:57 2013 -0500
Merge topic 'try_compile-targets' into next
6b987f9 Ensure that old-style defining the LINK_LIBRARIES in try_compile
works.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6b987f9066b8d42c611769da596d5c4ba831d96f
commit 6b987f9066b8d42c611769da596d5c4ba831d96f
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Feb 20 15:10:21 2013 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Wed Feb 20 15:10:56 2013 +0100
Ensure that old-style defining the LINK_LIBRARIES in try_compile works.
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index beb4963..387f6ed 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -92,6 +92,7 @@ int cmCoreTryCompile::TryCompileCode(std::vectorstd::string
const argv)
std::vectorcmTarget* targets;
std::string libsToLink = ;
+ bool useOldLinkLibs = true;
for (i = 3; i argv.size(); ++i)
{
if (argv[i] == LINK_LIBRARIES)
@@ -104,6 +105,7 @@ int
cmCoreTryCompile::TryCompileCode(std::vectorstd::string const argv)
}
extraArgs++;
++i;
+ useOldLinkLibs = false;
for ( ; i argv.size() argv[i] != CMAKE_FLAGS
argv[i] != COMPILE_DEFINITIONS argv[i] != OUTPUT_VARIABLE;
++i)
@@ -375,7 +377,7 @@ int
cmCoreTryCompile::TryCompileCode(std::vectorstd::string const argv)
this-BinaryDirectory.c_str());
/* Create the actual executable. */
fprintf(fout, ADD_EXECUTABLE(%s \%s\)\n, targetName, source.c_str());
-if (libsToLink.empty())
+if (useOldLinkLibs)
{
fprintf(fout,
TARGET_LINK_LIBRARIES(%s ${LINK_LIBRARIES})\n,targetName);
---
Summary of changes:
Source/cmCoreTryCompile.cxx |4 +++-
1 files changed, 3 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.10.2-2248-gc46387b
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 c46387bcc87cf55718e30f2013b5164cb8858fe2 (commit)
via aaad58c5af56285ea41006a5f60c79b4c255a118 (commit)
from aaa9ccf325b386d8b500c0b95a2cac1409375d51 (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=c46387bcc87cf55718e30f2013b5164cb8858fe2
commit c46387bcc87cf55718e30f2013b5164cb8858fe2
Merge: aaa9ccf aaad58c
Author: Alexander Neundorf neund...@kde.org
AuthorDate: Wed Feb 20 13:35:17 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Feb 20 13:35:17 2013 -0500
Merge topic 'FPHSA_USE_ORIGINAL_CASE' into next
aaad58c FPHSA: add USE_ORIGINAL_CASE option
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aaad58c5af56285ea41006a5f60c79b4c255a118
commit aaad58c5af56285ea41006a5f60c79b4c255a118
Author: Alex Neundorf neund...@kde.org
AuthorDate: Wed Feb 20 19:35:11 2013 +0100
Commit: Alex Neundorf neund...@kde.org
CommitDate: Wed Feb 20 19:35:11 2013 +0100
FPHSA: add USE_ORIGINAL_CASE option
If FPHSA() is called with USE_ORIGINAL_CASE, then the name
of the _FOUND variable will be SomePackage_FOUND instead of
SOMEPACKAGE_FOUND.
Alex
diff --git a/Modules/FindPackageHandleStandardArgs.cmake
b/Modules/FindPackageHandleStandardArgs.cmake
index e89e9a9..3729c15 100644
--- a/Modules/FindPackageHandleStandardArgs.cmake
+++ b/Modules/FindPackageHandleStandardArgs.cmake
@@ -2,7 +2,7 @@
#
# This function is intended to be used in FindXXX.cmake modules files.
# It handles the REQUIRED, QUIET and version-related arguments to
find_package().
-# It also sets the UPPERCASED_NAME_FOUND variable.
+# It also sets the packagename_FOUND variable.
# The package is considered found if all variables var1... listed contain
# valid results, e.g. valid filepaths.
#
@@ -18,14 +18,20 @@
# for the failure case. This is not recommended.
#
# The second mode is more powerful and also supports version checking:
-#FIND_PACKAGE_HANDLE_STANDARD_ARGS(NAME [REQUIRED_VARS var1...varN]
+#FIND_PACKAGE_HANDLE_STANDARD_ARGS(NAME [USE_ORIGINAL_CASE]
+# [REQUIRED_VARS var1...varN]
# [VERSION_VAR versionvar]
# [HANDLE_COMPONENTS]
# [CONFIG_MODE]
# [FAIL_MESSAGE Custom failure
message] )
#
-# As above, if var1 through varN are all valid, UPPERCASED_NAME_FOUND
-# will be set to TRUE.
+# If USE_ORIGINAL_CASE is used, then the name of the _FOUND-variable will be
+# the name of the package in original casing and _FOUND appended, e.g.
SomePackage_FOUND.
+# If USE_ORIGINAL_CASE is not used, the package name will be uppercased, e.g
+# SOMEPACKAGE_FOUND. This was the only behaviour before CMake 2.8.11.
+#
+# As in the simple mode, if var1 through varN are all valid,
+# packagename_NAME_FOUND will be set to TRUE.
# After REQUIRED_VARS the variables which are required for this package are
listed.
# Following VERSION_VAR the name of the variable can be specified which holds
# the version of the package which has been found. If this is done, this
version
@@ -35,7 +41,7 @@
# which has been actually found, both if the version is ok or not.
# If the package supports components, use the HANDLE_COMPONENTS option to
enable
# handling them. In this case, find_package_handle_standard_args() will report
-# which components have been found and which are missing, and the NAME_FOUND
+# which components have been found and which are missing, and the
packagename_FOUND
# variable will be set to FALSE if any of the required components (i.e. not the
# ones listed after OPTIONAL_COMPONENTS) are missing.
# Use the option CONFIG_MODE if your FindXXX.cmake module is a wrapper for
@@ -137,7 +143,7 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
# set up the arguments for CMAKE_PARSE_ARGUMENTS and check whether we are in
# new extended or in the old mode:
- set(options CONFIG_MODE HANDLE_COMPONENTS)
+ set(options CONFIG_MODE HANDLE_COMPONENTS USE_ORIGINAL_CASE)
set(oneValueArgs FAIL_MESSAGE VERSION_VAR)
set(multiValueArgs REQUIRED_VARS)
set(_KEYWORDS_FOR_EXTENDED_MODE ${options} ${oneValueArgs}
${multiValueArgs} )
@@ -183,22 +189,28 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME
_FIRST_ARG)
string(TOUPPER ${_NAME} _NAME_UPPER)
string(TOLOWER ${_NAME} _NAME_LOWER)
+ if(FPHSA_USE_ORIGINAL_CASE)
+set(_FOUND_VAR ${_NAME}_FOUND)
+ else()
+set(_FOUND_VAR
[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2250-g26d2380
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 26d2380d3a1090170b4607217db7558576983e5d (commit)
via 11d0c662069e3fd74cb908f714274eeb05f1a14d (commit)
from c46387bcc87cf55718e30f2013b5164cb8858fe2 (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=26d2380d3a1090170b4607217db7558576983e5d
commit 26d2380d3a1090170b4607217db7558576983e5d
Merge: c46387b 11d0c66
Author: Alexander Neundorf neund...@kde.org
AuthorDate: Wed Feb 20 14:09:59 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Feb 20 14:09:59 2013 -0500
Merge topic 'ExportFileGenerator_GenerateNicerErrorCheckingCode' into next
11d0c66 export files: rewrite the code for checking required targets
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=11d0c662069e3fd74cb908f714274eeb05f1a14d
commit 11d0c662069e3fd74cb908f714274eeb05f1a14d
Author: Alex Neundorf neund...@kde.org
AuthorDate: Mon Feb 11 22:18:48 2013 +0100
Commit: Alex Neundorf neund...@kde.org
CommitDate: Wed Feb 20 20:09:45 2013 +0100
export files: rewrite the code for checking required targets
Instead of generating a whole bunch of repeated if-statements
now a foreach()-loop is generated in the targets-file.
Also now a comment is inserted in the generated file if no
targets from other export sets are used, so if somebody looks
at the file he can see whether the information about missing
imported targets has been generated or not.
Alex
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index ef4ea38..e55f168 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -754,29 +754,46 @@ void
cmExportFileGenerator::GenerateMissingTargetsCheckCode(std::ostream os,
{
if (missingTargets.empty())
{
+os # This file does not depend on other imported targets which have\n
+ # been exported from the same project but in a separate
+export set.\n\n;
return;
}
os # Make sure the targets which have been exported in some other \n
-# export set exist.\n;
+# export set exist.\n
+unset(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets)\n
+foreach(_target ;
std::setstd::string emitted;
for(unsigned int i=0; imissingTargets.size(); ++i)
{
if (emitted.insert(missingTargets[i]).second)
{
- os if(NOT TARGET \ missingTargets[i] \ )\n
- if(CMAKE_FIND_PACKAGE_NAME)\n
- set( ${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE)\n
- set( ${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE
- \Required imported target \\\ missingTargets[i]
- \\\ not found ! \)\n
- else()\n
- message(FATAL_ERROR \Required imported target \\\
- missingTargets[i] \\\ not found ! \)\n
- endif()\n
- endif()\n;
+ os \ missingTargets[i] \ ;
}
}
- os \n;
+ os )\n
+ if(NOT TARGET \${_target}\ )\n
+set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets \
+${${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets} ${_target}\)
+\n
+ endif()\n
+endforeach()\n
+\n
+if(DEFINED ${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets)\n
+ if(CMAKE_FIND_PACKAGE_NAME)\n
+set( ${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE)\n
+set( ${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE
+\The following imported targets are
+referenced, but are missing:
+ ${${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets}\)\n
+ else()\n
+message(FATAL_ERROR \The following imported targets are
+referenced, but are missing:
+${${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets}\)\n
+ endif()\n
+endif()\n
+unset(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets)\n
+\n;
}
---
Summary of changes:
Source/cmExportFileGenerator.cxx | 43 ++---
1 files changed, 30 insertions(+), 13 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.10.2-2252-gf6180d8
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 f6180d8aee61e7f170caadcce23eda6623665eba (commit)
via f497dbce93096eb6f0edec982e5f16f9c56520b7 (commit)
from 26d2380d3a1090170b4607217db7558576983e5d (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=f6180d8aee61e7f170caadcce23eda6623665eba
commit f6180d8aee61e7f170caadcce23eda6623665eba
Merge: 26d2380 f497dbc
Author: Alexander Neundorf neund...@kde.org
AuthorDate: Wed Feb 20 14:12:13 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Feb 20 14:12:13 2013 -0500
Merge topic 'cmLocalGenerator_RemoveVirtuals' into next
f497dbc cmLocalGenerator: remove virtual where not used
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f497dbce93096eb6f0edec982e5f16f9c56520b7
commit f497dbce93096eb6f0edec982e5f16f9c56520b7
Author: Alex Neundorf neund...@kde.org
AuthorDate: Wed Feb 20 19:48:39 2013 +0100
Commit: Alex Neundorf neund...@kde.org
CommitDate: Wed Feb 20 19:48:39 2013 +0100
cmLocalGenerator: remove virtual where not used
This patch makes several functions of cmLocalGenerator which are marked
as virtual non-virtual, since they are not reimplemented anywhere.
Alex
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 84cf6ca..a1c34f0 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -49,29 +49,29 @@ public:
/**
* Calls TraceVSDependencies() on all targets of this generator.
*/
- virtual void TraceDependencies();
+ void TraceDependencies();
virtual void AddHelperCommands() {}
/**
* Perform any final calculations prior to generation
*/
- virtual void ConfigureFinalPass();
+ void ConfigureFinalPass();
/**
* Generate the install rules files in this directory.
*/
- virtual void GenerateInstallRules();
+ void GenerateInstallRules();
/**
* Generate the test files for tests.
*/
- virtual void GenerateTestFiles();
+ void GenerateTestFiles();
/**
* Generate a manifest of target files that will be built.
*/
- virtual void GenerateTargetManifest();
+ void GenerateTargetManifest();
///! Get the makefile for this generator
cmMakefile *GetMakefile() {
---
Summary of changes:
Source/cmLocalGenerator.h | 10 +-
1 files changed, 5 insertions(+), 5 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.10.2-2254-g7487a8f
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 7487a8f9b09bd683c34da4db1c969b6cff45e9e9 (commit)
via 12183914ad7552494a35237736dd7c26c36bdc64 (commit)
from f6180d8aee61e7f170caadcce23eda6623665eba (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=7487a8f9b09bd683c34da4db1c969b6cff45e9e9
commit 7487a8f9b09bd683c34da4db1c969b6cff45e9e9
Merge: f6180d8 1218391
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Feb 20 18:07:12 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Feb 20 18:07:12 2013 -0500
Merge topic 'fix-automoc-linker-language' into next
1218391 Add automoc source file to target early to set the linker language.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=12183914ad7552494a35237736dd7c26c36bdc64
commit 12183914ad7552494a35237736dd7c26c36bdc64
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Feb 20 17:06:45 2013 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Wed Feb 20 17:06:45 2013 +0100
Add automoc source file to target early to set the linker language.
Previously, GetIncludeDirectories was called before calling
target-AddSourceFile(mocCppSource). Since commit a1c4905f (Use the
link information as a source of compile definitions and
includes., 2013-02-12), the include directories are determined by
the link information.
Valid link information requires that the linker language can be
determined, which depends on the source files languages and the
dependent targets languages. In the case of the no_link_languages
target in the unit test, there are no dependencies and the additional
source file no_link_languages_automoc.cpp is added to the target
at generate-time. That file can be used to determine the linker
language, but it must be added to the target before calling
GetIncludeDirectories.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index ba29589..f2defbb 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1067,6 +1067,8 @@ bool cmGlobalGenerator::CheckTargets()
void cmGlobalGenerator::CreateAutomocTargets()
{
#ifdef CMAKE_BUILD_WITH_CMAKE
+ typedef std::vectorstd::paircmQtAutomoc, cmTarget* Automocs;
+ Automocs automocs;
for(unsigned int i=0; i this-LocalGenerators.size(); ++i)
{
cmTargets targets =
@@ -1084,11 +1086,17 @@ void cmGlobalGenerator::CreateAutomocTargets()
if(target.GetPropertyAsBool(AUTOMOC) !target.IsImported())
{
cmQtAutomoc automoc;
- automoc.SetupAutomocTarget(target);
+ automoc.InitializeMocSourceFile(target);
+ automocs.push_back(std::make_pair(automoc, target));
}
}
}
}
+ for (Automocs::iterator it = automocs.begin(); it != automocs.end();
+ ++it)
+{
+it-first.SetupAutomocTarget(it-second);
+}
#endif
}
diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx
index 4818f1b..10ce641 100644
--- a/Source/cmQtAutomoc.cxx
+++ b/Source/cmQtAutomoc.cxx
@@ -119,6 +119,22 @@ cmQtAutomoc::cmQtAutomoc()
}
}
+void cmQtAutomoc::InitializeMocSourceFile(cmTarget* target)
+{
+ std::string automocTargetName = target-GetName();
+ cmMakefile *makefile = target-GetMakefile();
+ automocTargetName += _automoc;
+ std::string mocCppFile = makefile-GetCurrentOutputDirectory();
+ mocCppFile += /;
+ mocCppFile += automocTargetName;
+ mocCppFile += .cpp;
+ cmSourceFile* mocCppSource = makefile-GetOrCreateSource(mocCppFile.c_str(),
+ true);
+ makefile-AppendProperty(ADDITIONAL_MAKE_CLEAN_FILES,
+ mocCppFile.c_str(), false);
+
+ target-AddSourceFile(mocCppSource);
+}
void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
{
@@ -268,17 +284,6 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
outputFile += /AutomocInfo.cmake;
makefile-ConfigureFile(inputFile.c_str(), outputFile.c_str(),
false, true, false);
-
- std::string mocCppFile = makefile-GetCurrentOutputDirectory();
- mocCppFile += /;
- mocCppFile += automocTargetName;
- mocCppFile += .cpp;
- cmSourceFile* mocCppSource = makefile-GetOrCreateSource(mocCppFile.c_str(),
- true);
- target-AddSourceFile(mocCppSource);
-
- makefile-AppendProperty(ADDITIONAL_MAKE_CLEAN_FILES,
- mocCppFile.c_str(), false);
}
diff --git a/Source/cmQtAutomoc.h b/Source/cmQtAutomoc.h
index
[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2256-g2bb5dd1
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 2bb5dd19d2d2134efd6b0396daee5c462d7a9bed (commit) via 1e0891e28ac8d595a7bdab6dc2ac5c3d76061233 (commit) from 7487a8f9b09bd683c34da4db1c969b6cff45e9e9 (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=2bb5dd19d2d2134efd6b0396daee5c462d7a9bed commit 2bb5dd19d2d2134efd6b0396daee5c462d7a9bed Merge: 7487a8f 1e0891e Author: Marcus D. Hanwell marcus.hanw...@kitware.com AuthorDate: Wed Feb 20 22:36:08 2013 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Feb 20 22:36:08 2013 -0500 Merge topic 'generate-export-header-warnings' into next 1e0891e Removed GenerateExportHeader warnings about old compilers http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e0891e28ac8d595a7bdab6dc2ac5c3d76061233 commit 1e0891e28ac8d595a7bdab6dc2ac5c3d76061233 Author: Marcus D. Hanwell marcus.hanw...@kitware.com AuthorDate: Wed Feb 20 11:48:12 2013 -0500 Commit: Marcus D. Hanwell marcus.hanw...@kitware.com CommitDate: Wed Feb 20 11:48:12 2013 -0500 Removed GenerateExportHeader warnings about old compilers These warnings tend to flood the dashboard submissions, and it is doing what it should (degrade gracefully with older compilers). diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake index ce23d5d..c88a3a2 100644 --- a/Modules/GenerateExportHeader.cmake +++ b/Modules/GenerateExportHeader.cmake @@ -156,16 +156,12 @@ macro(_test_compiler_hidden_visibility) if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.2) set(GCC_TOO_OLD TRUE) -message(WARNING GCC version older than 4.2) elseif(CMAKE_COMPILER_IS_GNUC AND CMAKE_C_COMPILER_VERSION VERSION_LESS 4.2) set(GCC_TOO_OLD TRUE) -message(WARNING GCC version older than 4.2) elseif(CMAKE_CXX_COMPILER_ID MATCHES Intel AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.0) set(_INTEL_TOO_OLD TRUE) -message(WARNING Intel compiler older than 12.0) endif() - # 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 --- Summary of changes: Modules/GenerateExportHeader.cmake |4 1 files changed, 0 insertions(+), 4 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, master, updated. v2.8.10.2-743-gf7474f3
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 f7474f3a0195c105b9b981bc4d558edcc1dede57 (commit) from f7029572ca5948ff87ba0c6e8aaff35f6fdab4f1 (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=f7474f3a0195c105b9b981bc4d558edcc1dede57 commit f7474f3a0195c105b9b981bc4d558edcc1dede57 Author: Kitware Robot kwro...@kitware.com AuthorDate: Thu Feb 21 00:01:08 2013 -0500 Commit: Kitware Robot kwro...@kitware.com CommitDate: Thu Feb 21 00:01:08 2013 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index a03488f..3a3b8b9 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -2,5 +2,5 @@ set(CMake_VERSION_MAJOR 2) set(CMake_VERSION_MINOR 8) set(CMake_VERSION_PATCH 10) -set(CMake_VERSION_TWEAK 20130220) +set(CMake_VERSION_TWEAK 20130221) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.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
