[Cmake-commits] CMake branch, master, updated. v3.8.1-1359-g4728131
Kitware Robot
kwrobot at kitware.com
Wed May 31 08:55:05 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 47281310bf610f3ab975d00831e9f3fe713ddde1 (commit)
via ff56a2f7201d71c741717ee4651075d0accfd9fe (commit)
via 926ef3ee032146b764e216d33270a6a9a65d1d5a (commit)
via 3251da6fa270f138920570aac89e8a5c65861661 (commit)
via ed77c5c5bd8c3ac9ca172db39019ec71cd243a8a (commit)
via b398e716f990a39ae1b47246c181a7d20a7c2f0e (commit)
via da2330bd32860b87448e420b3b27066076a87a21 (commit)
via 5dd0b5312c3cafb6a8d9ad2baf641ca4d88b2415 (commit)
via f34f7815e3e6d15dafb8df5264b588a23d293638 (commit)
via be55f069f926472369627a99c1b7b5d01aee47c5 (commit)
from b3379e63e04836d629bcecaa37f2f044ec11f523 (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=47281310bf610f3ab975d00831e9f3fe713ddde1
commit 47281310bf610f3ab975d00831e9f3fe713ddde1
Merge: ff56a2f ed77c5c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed May 31 12:54:47 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed May 31 08:54:51 2017 -0400
Merge topic 'minor-cleanups'
ed77c5c5 cmQtAutoGeneratorInitializer: Remove unused local variable
b398e716 cmVisualStudio10TargetGenerator: Remove shadowing local variable
da2330bd cmVisualStudio10ToolsetOptions: Remove unused include
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !910
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff56a2f7201d71c741717ee4651075d0accfd9fe
commit ff56a2f7201d71c741717ee4651075d0accfd9fe
Merge: 926ef3e 5dd0b53
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed May 31 12:52:18 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed May 31 08:54:13 2017 -0400
Merge topic 'bootstrap-drop-osf'
5dd0b531 bootstrap: remove explicit support for Tru64 UNIX
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !904
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=926ef3ee032146b764e216d33270a6a9a65d1d5a
commit 926ef3ee032146b764e216d33270a6a9a65d1d5a
Merge: 3251da6 be55f06
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed May 31 12:52:03 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed May 31 08:53:39 2017 -0400
Merge topic 'fix-XCTest-build-config'
be55f069 Tests: Fix XCTest build configuration
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !907
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3251da6fa270f138920570aac89e8a5c65861661
commit 3251da6fa270f138920570aac89e8a5c65861661
Merge: b3379e6 f34f781
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed May 31 12:51:55 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed May 31 08:52:38 2017 -0400
Merge topic 'fix-Qt5Autogen-xcode'
f34f7815 Tests: Fix Qt5Autogen test on Xcode
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !908
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ed77c5c5bd8c3ac9ca172db39019ec71cd243a8a
commit ed77c5c5bd8c3ac9ca172db39019ec71cd243a8a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 30 13:27:01 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue May 30 13:27:36 2017 -0400
cmQtAutoGeneratorInitializer: Remove unused local variable
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index e82665b..a39c10b 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -790,8 +790,6 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
bool usePRE_BUILD = false;
cmGlobalGenerator* gg = lg->GetGlobalGenerator();
if (gg->GetName().find("Visual Studio") != std::string::npos) {
- cmGlobalVisualStudioGenerator* vsgg =
- static_cast<cmGlobalVisualStudioGenerator*>(gg);
// Under VS use a PRE_BUILD event instead of a separate target to
// reduce the number of targets loaded into the IDE.
// This also works around a VS 11 bug that may skip updating the target:
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b398e716f990a39ae1b47246c181a7d20a7c2f0e
commit b398e716f990a39ae1b47246c181a7d20a7c2f0e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 30 13:25:37 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue May 30 13:27:31 2017 -0400
cmVisualStudio10TargetGenerator: Remove shadowing local variable
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index e174f13..46c2894 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -3154,8 +3154,6 @@ bool cmVisualStudio10TargetGenerator::ComputeLinkOptions(
// FIXME: Select flag table based on toolset instead of VS version.
if (this->LocalGenerator->GetVersion() >=
cmGlobalVisualStudioGenerator::VS14) {
- cmGlobalVisualStudio10Generator* gg =
- static_cast<cmGlobalVisualStudio10Generator*>(this->GlobalGenerator);
const char* toolset = gg->GetPlatformToolset();
if (toolset &&
(toolset == kWINDOWS_7_1_SDK || /* clang-format please break here */
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da2330bd32860b87448e420b3b27066076a87a21
commit da2330bd32860b87448e420b3b27066076a87a21
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 30 13:24:04 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue May 30 13:24:04 2017 -0400
cmVisualStudio10ToolsetOptions: Remove unused include
diff --git a/Source/cmVisualStudio10ToolsetOptions.cxx b/Source/cmVisualStudio10ToolsetOptions.cxx
index 0f15ec4..afca216 100644
--- a/Source/cmVisualStudio10ToolsetOptions.cxx
+++ b/Source/cmVisualStudio10ToolsetOptions.cxx
@@ -11,7 +11,6 @@
#include "cmVS10LibFlagTable.h"
#include "cmVS10LinkFlagTable.h"
#include "cmVS10MASMFlagTable.h"
-#include "cmVS10NASMFlagTable.h"
#include "cmVS10RCFlagTable.h"
#include "cmVS11CLFlagTable.h"
#include "cmVS11CSharpFlagTable.h"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5dd0b5312c3cafb6a8d9ad2baf641ca4d88b2415
commit 5dd0b5312c3cafb6a8d9ad2baf641ca4d88b2415
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Sun May 28 23:41:09 2017 +0200
Commit: Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Tue May 30 17:42:20 2017 +0200
bootstrap: remove explicit support for Tru64 UNIX
diff --git a/bootstrap b/bootstrap
index 0e76f4a..daf405e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1111,56 +1111,6 @@ rm -f "${TMPFILE}.cxx"
if [ "x${cmake_cxx_compiler_is_gnu}" != "x1" ]; then
# Check for non-GNU compiler flags
- # If we are on OSF, check for -timplicit_local -no_implicit_include
- cmake_test_flags="-timplicit_local -no_implicit_include"
- if [ "x${cmake_system}" = "xOSF1" ]; then
- TMPFILE=`cmake_tmp_file`
- echo '
- #include <iostream>
- int main() { std::cout << "We need '"${cmake_test_flags}"'" << std::endl; return 0;}
-' > ${TMPFILE}.cxx
- cmake_need_flags=1
- if cmake_try_run "${cmake_cxx_compiler}" \
- "${cmake_cxx_flags} ${cmake_test_flags}" "${TMPFILE}.cxx" >> cmake_bootstrap.log 2>&1; then
- :
- else
- cmake_need_flags=0
- fi
- if [ "x${cmake_need_flags}" = "x1" ]; then
- cmake_cxx_flags="${cmake_cxx_flags} ${cmake_test_flags}"
- echo "${cmake_cxx_compiler} needs ${cmake_test_flags}"
- else
- echo "${cmake_cxx_compiler} does not need ${cmake_test_flags}"
- fi
- rm -f "${TMPFILE}.cxx"
- fi
- cmake_test_flags=
-
- # If we are on OSF, check for -std strict_ansi -nopure_cname
- cmake_test_flags="-std strict_ansi -nopure_cname"
- if [ "x${cmake_system}" = "xOSF1" ]; then
- TMPFILE=`cmake_tmp_file`
- echo '
- #include <iostream>
- int main() { std::cout << "We need '"${cmake_test_flags}"'" << std::endl; return 0;}
-' > ${TMPFILE}.cxx
- cmake_need_flags=1
- if cmake_try_run "${cmake_cxx_compiler}" \
- "${cmake_cxx_flags} ${cmake_test_flags}" "${TMPFILE}.cxx" >> cmake_bootstrap.log 2>&1; then
- :
- else
- cmake_need_flags=0
- fi
- if [ "x${cmake_need_flags}" = "x1" ]; then
- cmake_cxx_flags="${cmake_cxx_flags} ${cmake_test_flags}"
- echo "${cmake_cxx_compiler} needs ${cmake_test_flags}"
- else
- echo "${cmake_cxx_compiler} does not need ${cmake_test_flags}"
- fi
- rm -f "${TMPFILE}.cxx"
- fi
- cmake_test_flags=
-
# If we are on HP-UX, check for -Ae for the C compiler.
if [ "x${cmake_system}" = "xHP-UX" ]; then
cmake_test_flags="-Ae"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f34f7815e3e6d15dafb8df5264b588a23d293638
commit f34f7815e3e6d15dafb8df5264b588a23d293638
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 30 10:08:44 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue May 30 10:09:37 2017 -0400
Tests: Fix Qt5Autogen test on Xcode
Fix the `mocPlugin` project to provide `mocPlugin.xcodeproj` instead of
`Project.xcodeproj` so that the `try_compile` project name matches.
Also search in the `Debug` subdirectory of the `try_compile` build tree
for the resulting binaries, to work with multi-config generators.
diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 101b396..073c5fd 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -304,10 +304,10 @@ if (NOT QT_TEST_VERSION STREQUAL 4)
set(timeformat "%Y%j%H%M%S")
set(mocPlugSrcDir "${CMAKE_CURRENT_SOURCE_DIR}/mocPlugin")
set(mocPlugBinDir "${CMAKE_CURRENT_BINARY_DIR}/mocPlugin")
- find_library(plAFile "PlugA" PATHS "${mocPlugBinDir}" NO_DEFAULT_PATH)
- find_library(plBFile "PlugB" PATHS "${mocPlugBinDir}" NO_DEFAULT_PATH)
- find_library(plCFile "PlugC" PATHS "${mocPlugBinDir}" NO_DEFAULT_PATH)
- find_library(plDFile "PlugD" PATHS "${mocPlugBinDir}" NO_DEFAULT_PATH)
+ find_library(plAFile "PlugA" PATHS "${mocPlugBinDir}/Debug" "${mocPlugBinDir}" NO_DEFAULT_PATH)
+ find_library(plBFile "PlugB" PATHS "${mocPlugBinDir}/Debug" "${mocPlugBinDir}" NO_DEFAULT_PATH)
+ find_library(plCFile "PlugC" PATHS "${mocPlugBinDir}/Debug" "${mocPlugBinDir}" NO_DEFAULT_PATH)
+ find_library(plDFile "PlugD" PATHS "${mocPlugBinDir}/Debug" "${mocPlugBinDir}" NO_DEFAULT_PATH)
file(TIMESTAMP "${plAFile}" plABefore "${timeformat}")
file(TIMESTAMP "${plBFile}" plBBefore "${timeformat}")
diff --git a/Tests/QtAutogen/mocPlugin/CMakeLists.txt b/Tests/QtAutogen/mocPlugin/CMakeLists.txt
index 4843c21..f80aa29 100644
--- a/Tests/QtAutogen/mocPlugin/CMakeLists.txt
+++ b/Tests/QtAutogen/mocPlugin/CMakeLists.txt
@@ -1,4 +1,5 @@
cmake_minimum_required(VERSION 3.8)
+project(mocPlugin CXX)
set(CMAKE_AUTOMOC_DEPEND_FILTERS
"A_CUSTOM_MACRO"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be55f069f926472369627a99c1b7b5d01aee47c5
commit be55f069f926472369627a99c1b7b5d01aee47c5
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 30 09:43:34 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue May 30 09:44:13 2017 -0400
Tests: Fix XCTest build configuration
Build the test binaries with the same configuration in which they will
be tested instead of the default Debug configuration. This fixes the
test when run in a Release configuration.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 335267a..21fe641 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1728,6 +1728,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
if(CMake_TEST_XCODE_VERSION AND NOT CMake_TEST_XCODE_VERSION VERSION_LESS 5
AND OSX_VERSION MATCHES "^([0-9]+\\.[0-9]+)")
+ set(XCTest_CTEST_OPTIONS --build-config $<CONFIGURATION>)
set(XCTest_BUILD_OPTIONS -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_MATCH_1} -DCMAKE_OSX_SYSROOT=macosx)
ADD_TEST_MACRO(XCTest ${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION> -V)
endif()
-----------------------------------------------------------------------
Summary of changes:
Source/cmQtAutoGeneratorInitializer.cxx | 2 --
Source/cmVisualStudio10TargetGenerator.cxx | 2 --
Source/cmVisualStudio10ToolsetOptions.cxx | 1 -
Tests/CMakeLists.txt | 1 +
Tests/QtAutogen/CMakeLists.txt | 8 ++---
Tests/QtAutogen/mocPlugin/CMakeLists.txt | 1 +
bootstrap | 50 ----------------------------
7 files changed, 6 insertions(+), 59 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list