[Cmake-commits] CMake branch, next, updated. v3.0.2-5358-ge1dc2e3
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 e1dc2e3050c1c61489ccff85479d03f81a98c084 (commit)
via 7bddcf337c145819774be52456e6c5c30756c002 (commit)
via b8877b1d62599bba7a014e95fbbd670f177243ce (commit)
from 240356877edd2ec55024b51bd0b862fcef002ee1 (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=e1dc2e3050c1c61489ccff85479d03f81a98c084
commit e1dc2e3050c1c61489ccff85479d03f81a98c084
Merge: 2403568 7bddcf3
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Sep 17 08:51:07 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Sep 17 08:51:07 2014 -0400
Merge topic 'autogen-fixes' into next
7bddcf33 QtAutogen: Process all ui files in a source file (#14981).
b8877b1d QtAutogen: Add source files to target when only AUTORCC is used.
diff --cc Tests/QtAutogen/CMakeLists.txt
index 3973653,f1a272a..3fd00b8
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@@ -64,15 -67,10 +67,16 @@@ add_custom_command
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/myotherinterface.h.in
)
+message(CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE})
+if (CMAKE_BUILD_TYPE MATCHES [Dd][Ee][Bb][Uu][Gg] AND NOT
CMAKE_CONFIGURATION_TYPES)
+ set(debug_srcs $$CONFIG:Debug:debug_class.cpp
$$CONFIG:Debug:debug_resource.qrc)
+ add_definitions(-DTEST_DEBUG_CLASS)
+endif()
+
add_executable(QtAutogen main.cpp calwidget.cpp second_widget.cpp foo.cpp
blub.cpp bar.cpp abc.cpp
+multiplewidgets.cpp
xyz.cpp yaf.cpp gadget.cpp $TARGET_OBJECTS:privateSlot
- test.qrc second_resource.qrc resourcetester.cpp generated.cpp
+ test.qrc second_resource.qrc resourcetester.cpp generated.cpp
${debug_srcs}
)
set_property(TARGET QtAutogen APPEND PROPERTY AUTOGEN_TARGET_DEPENDS
generate_moc_input ${CMAKE_CURRENT_BINARY_DIR}/myotherinterface.h)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7bddcf337c145819774be52456e6c5c30756c002
commit 7bddcf337c145819774be52456e6c5c30756c002
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Sep 17 01:23:57 2014 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Wed Sep 17 14:51:03 2014 +0200
QtAutogen: Process all ui files in a source file (#14981).
Use a vector to store a list of matched ui_ includes, instead of
overwriting the previous match.
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 4b8f810..9c5d846 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -1296,8 +1296,8 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
const std::vectorstd::string headerExtensions =
makefile-GetHeaderExtensions();
- std::mapstd::string, std::string includedUis;
- std::mapstd::string, std::string skippedUis;
+ std::mapstd::string, std::vectorstd::string includedUis;
+ std::mapstd::string, std::vectorstd::string skippedUis;
std::vectorstd::string uicSkipped;
cmSystemTools::ExpandListArgument(this-SkipUic, uicSkipped);
@@ -1307,7 +1307,7 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
{
const bool skipUic = std::find(uicSkipped.begin(), uicSkipped.end(), *it)
!= uicSkipped.end();
-std::mapstd::string, std::string uiFiles
+std::mapstd::string, std::vectorstd::string uiFiles
= skipUic ? skippedUis : includedUis;
const std::string absFilename = *it;
if (this-Verbose)
@@ -1368,12 +1368,17 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile*
makefile)
{
this-GenerateMoc(it-first, it-second);
}
- for(std::mapstd::string, std::string::const_iterator
+ for(std::mapstd::string, std::vectorstd::string ::const_iterator
it = includedUis.begin();
it != includedUis.end();
++it)
{
-this-GenerateUi(it-first, it-second);
+for (std::vectorstd::string::const_iterator nit = it-second.begin();
+nit != it-second.end();
+++nit)
+ {
+ this-GenerateUi(it-first, *nit);
+ }
}
if(!this-RccExecutable.empty())
@@ -1450,7 +1455,7 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
void cmQtAutoGenerators::ParseCppFile(const std::string absFilename,
const std::vectorstd::string headerExtensions,
std::mapstd::string, std::string includedMocs,
- std::mapstd::string, std::string includedUis)
+ std::mapstd::string,
[Cmake-commits] CMake branch, next, updated. v3.0.2-5361-gd86565b
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 d86565b9d0f0577bcf3428a74552001ca6f7534c (commit) via 49b8140e5db355229dd2984967e8a08713c9ea9b (commit) via 0b80fc350ae71f0926b426762cb1f6efe17a5723 (commit) from e1dc2e3050c1c61489ccff85479d03f81a98c084 (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=d86565b9d0f0577bcf3428a74552001ca6f7534c commit d86565b9d0f0577bcf3428a74552001ca6f7534c Merge: e1dc2e3 49b8140 Author: Stephen Kelly steve...@gmail.com AuthorDate: Wed Sep 17 08:58:15 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Sep 17 08:58:15 2014 -0400 Merge topic 'clang-compile-options-cxx14' into next 49b8140e Clang: Enable c++14 dialect flag with Clang 3.5. 0b80fc35 Clang: Don't overwrite c++11 compile option value with c++14 flag. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=49b8140e5db355229dd2984967e8a08713c9ea9b commit 49b8140e5db355229dd2984967e8a08713c9ea9b Author: Stephen Kelly steve...@gmail.com AuthorDate: Wed Sep 17 14:57:07 2014 +0200 Commit: Stephen Kelly steve...@gmail.com CommitDate: Wed Sep 17 14:57:07 2014 +0200 Clang: Enable c++14 dialect flag with Clang 3.5. diff --git a/Modules/Compiler/Clang-CXX.cmake b/Modules/Compiler/Clang-CXX.cmake index 7792999..5dd7b4a 100644 --- a/Modules/Compiler/Clang-CXX.cmake +++ b/Modules/Compiler/Clang-CXX.cmake @@ -23,7 +23,10 @@ elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 2.1) set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION -std=gnu++0x) endif() -if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4) +if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5) + set(CMAKE_CXX14_STANDARD_COMPILE_OPTION -std=c++14) + set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION -std=gnu++14) +elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4) set(CMAKE_CXX14_STANDARD_COMPILE_OPTION -std=c++1y) set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION -std=gnu++1y) endif() http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0b80fc350ae71f0926b426762cb1f6efe17a5723 commit 0b80fc350ae71f0926b426762cb1f6efe17a5723 Author: Stephen Kelly steve...@gmail.com AuthorDate: Wed Sep 17 14:56:16 2014 +0200 Commit: Stephen Kelly steve...@gmail.com CommitDate: Wed Sep 17 14:56:16 2014 +0200 Clang: Don't overwrite c++11 compile option value with c++14 flag. diff --git a/Modules/Compiler/Clang-CXX.cmake b/Modules/Compiler/Clang-CXX.cmake index bdb6d69..7792999 100644 --- a/Modules/Compiler/Clang-CXX.cmake +++ b/Modules/Compiler/Clang-CXX.cmake @@ -24,8 +24,8 @@ elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 2.1) endif() if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4) - set(CMAKE_CXX11_STANDARD_COMPILE_OPTION -std=c++1y) - set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION -std=gnu++1y) + set(CMAKE_CXX14_STANDARD_COMPILE_OPTION -std=c++1y) + set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION -std=gnu++1y) endif() set(CMAKE_CXX_STANDARD_DEFAULT 98) --- Summary of changes: Modules/Compiler/Clang-CXX.cmake |9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.2-5364-ga1bf041
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 a1bf041d167b621ae46f4f27b71ab0801947abbe (commit)
via 80bda1684d48b19a05637fe4167b5f9b1fd8ce2d (commit)
via 1927e4bacb8e3183488c0e71a18b73aa62e5f53a (commit)
from d86565b9d0f0577bcf3428a74552001ca6f7534c (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=a1bf041d167b621ae46f4f27b71ab0801947abbe
commit a1bf041d167b621ae46f4f27b71ab0801947abbe
Merge: d86565b 80bda16
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Sep 17 09:11:46 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Sep 17 09:11:46 2014 -0400
Merge topic 'minor-cleanups' into next
80bda168 Simplify use of binary_search.
1927e4ba Remove const char string comparison helper.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=80bda1684d48b19a05637fe4167b5f9b1fd8ce2d
commit 80bda1684d48b19a05637fe4167b5f9b1fd8ce2d
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Aug 6 15:20:24 2014 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Wed Sep 17 15:10:55 2014 +0200
Simplify use of binary_search.
A local string was created when dir was a const char*. Now dir is a
std::string already so the dirString is vestigal.
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 9a42ca2..14b5a92 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -519,9 +519,7 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const
std::string dir,
iter = this-SystemIncludesCache.insert(entry).first;
}
- std::string dirString = dir;
- return std::binary_search(iter-second.begin(), iter-second.end(),
-dirString);
+ return std::binary_search(iter-second.begin(), iter-second.end(), dir);
}
//
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1927e4bacb8e3183488c0e71a18b73aa62e5f53a
commit 1927e4bacb8e3183488c0e71a18b73aa62e5f53a
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Sep 17 15:07:55 2014 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Wed Sep 17 15:10:25 2014 +0200
Remove const char string comparison helper.
It is now unused.
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 3731502..8baf7b3 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -462,12 +462,6 @@ struct cmStrCmp {
return strcmp(input, m_test.c_str()) == 0;
}
- // For use with binary_search
- bool operator()(const char *str1, const char *str2) const
- {
-return strcmp(str1, str2) 0;
- }
-
private:
const std::string m_test;
};
---
Summary of changes:
Source/cmGeneratorTarget.cxx |4 +---
Source/cmStandardIncludes.h |6 --
2 files changed, 1 insertion(+), 9 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.2-1874-g201cc6f
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 201cc6fe095f1a0abfc34bb6482d933cc12ff055 (commit) from 7b11f87100f07d0c504da0720387f0c7f818fb3e (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=201cc6fe095f1a0abfc34bb6482d933cc12ff055 commit 201cc6fe095f1a0abfc34bb6482d933cc12ff055 Author: Kitware Robot kwro...@kitware.com AuthorDate: Thu Sep 18 00:01:09 2014 -0400 Commit: Kitware Robot kwro...@kitware.com CommitDate: Thu Sep 18 00:01:09 2014 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 489f6d8..36c426d 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 0) -set(CMake_VERSION_PATCH 20140917) +set(CMake_VERSION_PATCH 20140918) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
