[Cmake-commits] CMake branch, master, updated. v3.9.0-rc2-43-g20df0bc
Kitware Robot
kwrobot at kitware.com
Fri Jun 9 10:35:03 EDT 2017
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 20df0bcd7026b9209fb8c88052ad637e2559c74f (commit)
via b90330f5746aca43c3698c4761bf6c0060afa63e (commit)
via 7e6e37fdf1bf24194edad6fa8640b7fa8e92e393 (commit)
via d4d24c30f0648e45e43835fa104debacae0b4a7f (commit)
via 994beddb9342423c5b71b45c91bdffc7b0791bf2 (commit)
via a0436a2f618b7421e6582cb8f6d3f20a39b1f957 (commit)
via dcf559d060fcce32b3a946eecf51d32a3e2cc953 (commit)
via 5b02bcf682d8ed851f4733c5af61c471cf00296b (commit)
via 2d1c05c1669efa9eeba6f8606c47f92a3b880920 (commit)
via 62eec34c291572a684cdbc00d2b296295f589f32 (commit)
from 9dd1d351fe2cb90e3adbe5cb191f6a3727f78979 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=20df0bcd7026b9209fb8c88052ad637e2559c74f
commit 20df0bcd7026b9209fb8c88052ad637e2559c74f
Merge: b90330f a0436a2
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 9 14:34:39 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Jun 9 10:34:42 2017 -0400
Merge topic 'sdcc-simplify-link-flags'
a0436a2f SDCC: Remove superfluous whitespace from link line
dcf559d0 SDCC: Do not explicitly ask linker to generate Intel Hex files
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !942
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b90330f5746aca43c3698c4761bf6c0060afa63e
commit b90330f5746aca43c3698c4761bf6c0060afa63e
Merge: 7e6e37f 994bedd
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 9 14:33:58 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Jun 9 10:34:06 2017 -0400
Merge topic 'qt-pass-point-by-value'
994beddb CMakeSetupDialog: Pass QPoint by value
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !946
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7e6e37fdf1bf24194edad6fa8640b7fa8e92e393
commit 7e6e37fdf1bf24194edad6fa8640b7fa8e92e393
Merge: d4d24c3 5b02bcf
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 9 14:33:25 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Jun 9 10:33:47 2017 -0400
Merge topic 'no-return-void-expression'
5b02bcf6 QtDialog/FirstConfigure: remove 'return' from void expression
2d1c05c1 cmGlobalGenerator: remove 'return' from void expression
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !941
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4d24c30f0648e45e43835fa104debacae0b4a7f
commit d4d24c30f0648e45e43835fa104debacae0b4a7f
Merge: 9dd1d35 62eec34
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 9 14:32:49 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Jun 9 10:33:18 2017 -0400
Merge topic 'cpack-destructor-overrides'
62eec34c Add CM_OVERRIDE to CPack generator destructors
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !939
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=994beddb9342423c5b71b45c91bdffc7b0791bf2
commit 994beddb9342423c5b71b45c91bdffc7b0791bf2
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Thu Jun 8 22:15:21 2017 +0200
Commit: Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Thu Jun 8 22:15:21 2017 +0200
CMakeSetupDialog: Pass QPoint by value
diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx
index 57f8e10..5290afe 100644
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/Source/QtDialog/CMakeSetupDialog.cxx
@@ -1195,7 +1195,7 @@ void CMakeSetupDialog::setSearchFilter(const QString& str)
this->CacheValues->setSearchFilter(str);
}
-void CMakeSetupDialog::doOutputContextMenu(const QPoint& pt)
+void CMakeSetupDialog::doOutputContextMenu(QPoint pt)
{
QMenu* menu = this->Output->createStandardContextMenu();
diff --git a/Source/QtDialog/CMakeSetupDialog.h b/Source/QtDialog/CMakeSetupDialog.h
index 1abdb46..0da28d8 100644
--- a/Source/QtDialog/CMakeSetupDialog.h
+++ b/Source/QtDialog/CMakeSetupDialog.h
@@ -70,7 +70,7 @@ protected slots:
bool doConfigureInternal();
bool doGenerateInternal();
void exitLoop(int);
- void doOutputContextMenu(const QPoint&);
+ void doOutputContextMenu(QPoint pt);
void doOutputFindDialog();
void doOutputFindNext(bool directionForward = true);
void doOutputFindPrev();
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a0436a2f618b7421e6582cb8f6d3f20a39b1f957
commit a0436a2f618b7421e6582cb8f6d3f20a39b1f957
Author: Reto Schneider <reto.schneider at husqvarnagroup.com>
AuthorDate: Thu Jun 8 14:00:35 2017 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 8 13:19:49 2017 -0400
SDCC: Remove superfluous whitespace from link line
diff --git a/Modules/Platform/Generic-SDCC-C.cmake b/Modules/Platform/Generic-SDCC-C.cmake
index 82074cf..4b3912a 100644
--- a/Modules/Platform/Generic-SDCC-C.cmake
+++ b/Modules/Platform/Generic-SDCC-C.cmake
@@ -41,7 +41,7 @@ endif()
set(CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT> -c <SOURCE>")
# link object files to an executable
-set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS> <OBJECTS> -o <TARGET> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>")
+set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS> <OBJECTS> -o <TARGET> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>")
# needs sdcc 2.7.0 + sddclib from cvs
set(CMAKE_C_CREATE_STATIC_LIBRARY
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dcf559d060fcce32b3a946eecf51d32a3e2cc953
commit dcf559d060fcce32b3a946eecf51d32a3e2cc953
Author: Reto Schneider <reto.schneider at husqvarnagroup.com>
AuthorDate: Thu Jun 8 13:47:39 2017 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 8 13:18:28 2017 -0400
SDCC: Do not explicitly ask linker to generate Intel Hex files
The `--out-fmt-ihx` option added by commit v2.6.0~1253 (...use
--out-fmt-ihx to enforce .ihx files, 2007-08-15) may interfere with
options requested by the user. Also, when no linker output is
specified, SDCC outputs Intel Hex by default anyway.
diff --git a/Modules/Platform/Generic-SDCC-C.cmake b/Modules/Platform/Generic-SDCC-C.cmake
index bbefe19..82074cf 100644
--- a/Modules/Platform/Generic-SDCC-C.cmake
+++ b/Modules/Platform/Generic-SDCC-C.cmake
@@ -41,7 +41,7 @@ endif()
set(CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT> -c <SOURCE>")
# link object files to an executable
-set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS> <OBJECTS> --out-fmt-ihx -o <TARGET> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>")
+set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS> <OBJECTS> -o <TARGET> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>")
# needs sdcc 2.7.0 + sddclib from cvs
set(CMAKE_C_CREATE_STATIC_LIBRARY
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5b02bcf682d8ed851f4733c5af61c471cf00296b
commit 5b02bcf682d8ed851f4733c5af61c471cf00296b
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Thu Jun 8 16:40:57 2017 +0200
Commit: Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Thu Jun 8 16:40:57 2017 +0200
QtDialog/FirstConfigure: remove 'return' from void expression
diff --git a/Source/QtDialog/FirstConfigure.cxx b/Source/QtDialog/FirstConfigure.cxx
index b193a27..88ce7cb 100644
--- a/Source/QtDialog/FirstConfigure.cxx
+++ b/Source/QtDialog/FirstConfigure.cxx
@@ -301,7 +301,7 @@ QString CrossCompilerSetup::getFindRoot() const
void CrossCompilerSetup::setFindRoot(const QString& t)
{
- return this->crossFindRoot->setText(t);
+ this->crossFindRoot->setText(t);
}
int CrossCompilerSetup::getProgramMode() const
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2d1c05c1669efa9eeba6f8606c47f92a3b880920
commit 2d1c05c1669efa9eeba6f8606c47f92a3b880920
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Thu Jun 8 16:35:02 2017 +0200
Commit: Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Thu Jun 8 16:40:11 2017 +0200
cmGlobalGenerator: remove 'return' from void expression
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 099f705..591963f 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1075,7 +1075,7 @@ bool cmGlobalGenerator::GetLanguageEnabled(const std::string& l) const
void cmGlobalGenerator::ClearEnabledLanguages()
{
- return this->CMakeInstance->GetState()->ClearEnabledLanguages();
+ this->CMakeInstance->GetState()->ClearEnabledLanguages();
}
void cmGlobalGenerator::CreateLocalGenerators()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=62eec34c291572a684cdbc00d2b296295f589f32
commit 62eec34c291572a684cdbc00d2b296295f589f32
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 8 09:38:07 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 8 09:38:07 2017 -0400
Add CM_OVERRIDE to CPack generator destructors
diff --git a/Source/CPack/cmCPackBundleGenerator.h b/Source/CPack/cmCPackBundleGenerator.h
index 861fe4b..a127e7b 100644
--- a/Source/CPack/cmCPackBundleGenerator.h
+++ b/Source/CPack/cmCPackBundleGenerator.h
@@ -21,7 +21,7 @@ public:
cmCPackTypeMacro(cmCPackBundleGenerator, cmCPackDragNDropGenerator);
cmCPackBundleGenerator();
- virtual ~cmCPackBundleGenerator();
+ ~cmCPackBundleGenerator() CM_OVERRIDE;
protected:
int InitializeInternal() CM_OVERRIDE;
diff --git a/Source/CPack/cmCPackCygwinBinaryGenerator.h b/Source/CPack/cmCPackCygwinBinaryGenerator.h
index 58e80bd..b5a0531 100644
--- a/Source/CPack/cmCPackCygwinBinaryGenerator.h
+++ b/Source/CPack/cmCPackCygwinBinaryGenerator.h
@@ -17,7 +17,7 @@ public:
* Construct generator
*/
cmCPackCygwinBinaryGenerator();
- virtual ~cmCPackCygwinBinaryGenerator();
+ ~cmCPackCygwinBinaryGenerator() CM_OVERRIDE;
protected:
virtual int InitializeInternal();
diff --git a/Source/CPack/cmCPackCygwinSourceGenerator.h b/Source/CPack/cmCPackCygwinSourceGenerator.h
index 896de1d..d19f87c 100644
--- a/Source/CPack/cmCPackCygwinSourceGenerator.h
+++ b/Source/CPack/cmCPackCygwinSourceGenerator.h
@@ -17,7 +17,7 @@ public:
* Construct generator
*/
cmCPackCygwinSourceGenerator();
- virtual ~cmCPackCygwinSourceGenerator();
+ ~cmCPackCygwinSourceGenerator() CM_OVERRIDE;
protected:
const char* GetPackagingInstallPrefix();
diff --git a/Source/CPack/cmCPackDragNDropGenerator.h b/Source/CPack/cmCPackDragNDropGenerator.h
index ae2cc17..922325c 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.h
+++ b/Source/CPack/cmCPackDragNDropGenerator.h
@@ -23,7 +23,7 @@ public:
cmCPackTypeMacro(cmCPackDragNDropGenerator, cmCPackGenerator);
cmCPackDragNDropGenerator();
- virtual ~cmCPackDragNDropGenerator();
+ ~cmCPackDragNDropGenerator() CM_OVERRIDE;
protected:
int InitializeInternal() CM_OVERRIDE;
diff --git a/Source/CPack/cmCPackOSXX11Generator.h b/Source/CPack/cmCPackOSXX11Generator.h
index 0eebc6d..0a1770c 100644
--- a/Source/CPack/cmCPackOSXX11Generator.h
+++ b/Source/CPack/cmCPackOSXX11Generator.h
@@ -23,7 +23,7 @@ public:
* Construct generator
*/
cmCPackOSXX11Generator();
- virtual ~cmCPackOSXX11Generator();
+ ~cmCPackOSXX11Generator() CM_OVERRIDE;
protected:
virtual int InitializeInternal() CM_OVERRIDE;
diff --git a/Source/CPack/cmCPackPKGGenerator.h b/Source/CPack/cmCPackPKGGenerator.h
index f873c59..d9461ee 100644
--- a/Source/CPack/cmCPackPKGGenerator.h
+++ b/Source/CPack/cmCPackPKGGenerator.h
@@ -27,7 +27,7 @@ public:
* Construct generator
*/
cmCPackPKGGenerator();
- virtual ~cmCPackPKGGenerator();
+ ~cmCPackPKGGenerator() CM_OVERRIDE;
bool SupportsComponentInstallation() const CM_OVERRIDE;
diff --git a/Source/CPack/cmCPackPackageMakerGenerator.h b/Source/CPack/cmCPackPackageMakerGenerator.h
index 6274515..770f434 100644
--- a/Source/CPack/cmCPackPackageMakerGenerator.h
+++ b/Source/CPack/cmCPackPackageMakerGenerator.h
@@ -25,7 +25,7 @@ public:
* Construct generator
*/
cmCPackPackageMakerGenerator();
- virtual ~cmCPackPackageMakerGenerator();
+ ~cmCPackPackageMakerGenerator() CM_OVERRIDE;
bool SupportsComponentInstallation() const CM_OVERRIDE;
protected:
diff --git a/Source/CPack/cmCPackProductBuildGenerator.h b/Source/CPack/cmCPackProductBuildGenerator.h
index 12093a0..3435641 100644
--- a/Source/CPack/cmCPackProductBuildGenerator.h
+++ b/Source/CPack/cmCPackProductBuildGenerator.h
@@ -25,7 +25,7 @@ public:
* Construct generator
*/
cmCPackProductBuildGenerator();
- virtual ~cmCPackProductBuildGenerator();
+ ~cmCPackProductBuildGenerator() CM_OVERRIDE;
protected:
int InitializeInternal() CM_OVERRIDE;
-----------------------------------------------------------------------
Summary of changes:
Modules/Platform/Generic-SDCC-C.cmake | 2 +-
Source/CPack/cmCPackBundleGenerator.h | 2 +-
Source/CPack/cmCPackCygwinBinaryGenerator.h | 2 +-
Source/CPack/cmCPackCygwinSourceGenerator.h | 2 +-
Source/CPack/cmCPackDragNDropGenerator.h | 2 +-
Source/CPack/cmCPackOSXX11Generator.h | 2 +-
Source/CPack/cmCPackPKGGenerator.h | 2 +-
Source/CPack/cmCPackPackageMakerGenerator.h | 2 +-
Source/CPack/cmCPackProductBuildGenerator.h | 2 +-
Source/QtDialog/CMakeSetupDialog.cxx | 2 +-
Source/QtDialog/CMakeSetupDialog.h | 2 +-
Source/QtDialog/FirstConfigure.cxx | 2 +-
Source/cmGlobalGenerator.cxx | 2 +-
13 files changed, 13 insertions(+), 13 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list