[Cmake-commits] CMake branch, master, updated. v3.10.0-rc1-46-g8af7a16
Kitware Robot
kwrobot at kitware.com
Tue Oct 10 09:15: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 8af7a16be7290b84c233c5e7749600aa57c4a28a (commit)
via 60c688c6c37e9867462950c2fb2be7f3aef756b4 (commit)
via 3a49b4eb78a123e1b809ed57dd888d362aac2cb2 (commit)
via 78a560e42bc475ff3fbebd8baa1f12ea0f3ea172 (commit)
via a483b7eac257381a98deb750f516e3e699dfbce4 (commit)
from f3bbb37b253a1f4a26809d6f132b3996aa2e16fc (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=8af7a16be7290b84c233c5e7749600aa57c4a28a
commit 8af7a16be7290b84c233c5e7749600aa57c4a28a
Merge: 60c688c a483b7e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 10 13:10:51 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Oct 10 09:10:54 2017 -0400
Merge topic 'tryrun-strcpy'
a483b7ea TryRun: do not call strcpy()
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1364
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=60c688c6c37e9867462950c2fb2be7f3aef756b4
commit 60c688c6c37e9867462950c2fb2be7f3aef756b4
Merge: f3bbb37 3a49b4e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 10 13:10:01 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Oct 10 09:10:05 2017 -0400
Merge topic 'xcode-tests-ios-deployment-target'
3a49b4eb Xcode 9: Lower iOS deployment version to get armv7 builds
78a560e4 Revert "Xcode: Adjust tests to drop of 32bit iOS architectures"
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1365
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3a49b4eb78a123e1b809ed57dd888d362aac2cb2
commit 3a49b4eb78a123e1b809ed57dd888d362aac2cb2
Author: Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Sun Oct 8 22:24:13 2017 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 10 09:08:44 2017 -0400
Xcode 9: Lower iOS deployment version to get armv7 builds
diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
index 5f4bdc3..7d436b6 100644
--- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
+++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
@@ -1,5 +1,9 @@
include(RunCMake)
+if(XCODE_VERSION VERSION_GREATER_EQUAL 9)
+ set(IOS_DEPLOYMENT_TARGET "-DCMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET=10")
+endif()
+
run_cmake(XcodeFileType)
run_cmake(XcodeAttributeLocation)
run_cmake(XcodeAttributeGenex)
@@ -20,7 +24,9 @@ run_cmake(PerConfigPerSourceFlags)
if(NOT XCODE_VERSION VERSION_LESS 5)
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeInstallIOS-build)
set(RunCMake_TEST_NO_CLEAN 1)
- set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX:PATH=${RunCMake_BINARY_DIR}/ios_install")
+ set(RunCMake_TEST_OPTIONS
+ "-DCMAKE_INSTALL_PREFIX:PATH=${RunCMake_BINARY_DIR}/ios_install"
+ "${IOS_DEPLOYMENT_TARGET}")
file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
@@ -53,7 +59,8 @@ if(NOT XCODE_VERSION VERSION_LESS 5)
set(RunCMake_TEST_NO_CLEAN 1)
set(RunCMake_TEST_OPTIONS
"-DTEST_IOS=ON"
- "-DCMAKE_INSTALL_PREFIX:PATH=${RunCMake_TEST_BINARY_DIR}/_install")
+ "-DCMAKE_INSTALL_PREFIX:PATH=${RunCMake_TEST_BINARY_DIR}/_install"
+ "${IOS_DEPLOYMENT_TARGET}")
file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
@@ -117,7 +124,8 @@ if(NOT XCODE_VERSION VERSION_LESS 6)
set(RunCMake_TEST_NO_CLEAN 1)
set(RunCMake_TEST_OPTIONS
"-DCMAKE_INSTALL_PREFIX:PATH=${RunCMake_TEST_BINARY_DIR}/_install"
- "-DCMAKE_IOS_INSTALL_COMBINED=YES")
+ "-DCMAKE_IOS_INSTALL_COMBINED=YES"
+ "${IOS_DEPLOYMENT_TARGET}")
file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
@@ -135,7 +143,8 @@ if(NOT XCODE_VERSION VERSION_LESS 6)
set(RunCMake_TEST_NO_CLEAN 1)
set(RunCMake_TEST_OPTIONS
"-DCMAKE_INSTALL_PREFIX:PATH=${RunCMake_TEST_BINARY_DIR}/_install"
- "-DCMAKE_IOS_INSTALL_COMBINED=YES")
+ "-DCMAKE_IOS_INSTALL_COMBINED=YES"
+ "${IOS_DEPLOYMENT_TARGET}")
file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
@@ -153,7 +162,8 @@ if(NOT XCODE_VERSION VERSION_LESS 6)
set(RunCMake_TEST_NO_CLEAN 1)
set(RunCMake_TEST_OPTIONS
"-DCMAKE_INSTALL_PREFIX:PATH=${RunCMake_TEST_BINARY_DIR}/_install"
- "-DCMAKE_IOS_INSTALL_COMBINED=YES")
+ "-DCMAKE_IOS_INSTALL_COMBINED=YES"
+ "${IOS_DEPLOYMENT_TARGET}")
file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
@@ -170,6 +180,7 @@ endif()
if(NOT XCODE_VERSION VERSION_LESS 5)
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeMultiplatform-build)
set(RunCMake_TEST_NO_CLEAN 1)
+ set(RunCMake_TEST_OPTIONS "${IOS_DEPLOYMENT_TARGET}")
file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=78a560e42bc475ff3fbebd8baa1f12ea0f3ea172
commit 78a560e42bc475ff3fbebd8baa1f12ea0f3ea172
Author: Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Sun Oct 8 21:17:41 2017 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 10 09:08:44 2017 -0400
Revert "Xcode: Adjust tests to drop of 32bit iOS architectures"
This reverts commit d210b2813072c874ee13fcc941e41aacacf09874.
diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
index 554aa2f..5f4bdc3 100644
--- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
+++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
@@ -129,9 +129,7 @@ if(NOT XCODE_VERSION VERSION_LESS 6)
unset(RunCMake_TEST_BINARY_DIR)
unset(RunCMake_TEST_NO_CLEAN)
unset(RunCMake_TEST_OPTIONS)
-endif()
-if(XCODE_VERSION VERSION_GREATER_EQUAL 6 AND XCODE_VERSION VERSION_LESS 9)
# XcodeIOSInstallCombinedPrune
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeIOSInstallCombinedPrune-build)
set(RunCMake_TEST_NO_CLEAN 1)
diff --git a/Tests/RunCMake/XcodeProject/XcodeBundles.cmake b/Tests/RunCMake/XcodeProject/XcodeBundles.cmake
index cee71fa..0b854d8 100644
--- a/Tests/RunCMake/XcodeProject/XcodeBundles.cmake
+++ b/Tests/RunCMake/XcodeProject/XcodeBundles.cmake
@@ -5,11 +5,7 @@ enable_language(C)
if(TEST_IOS)
set(CMAKE_OSX_SYSROOT iphoneos)
- if(XCODE_VERSION VERSION_GREATER_EQUAL 9)
- set(CMAKE_OSX_ARCHITECTURES "arm64")
- else()
- set(CMAKE_OSX_ARCHITECTURES "armv7")
- endif()
+ set(CMAKE_OSX_ARCHITECTURES "armv7")
set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "NO")
endif(TEST_IOS)
diff --git a/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined-install-check.cmake b/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined-install-check.cmake
index cd71205..a1c0671 100644
--- a/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined-install-check.cmake
+++ b/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined-install-check.cmake
@@ -13,11 +13,7 @@ function(verify_architectures file)
string(REPLACE "architecture " "" actual "${architectures}")
list(SORT actual)
- if(XCODE_VERSION VERSION_GREATER_EQUAL 9)
- set(expected arm64 x86_64)
- else()
- set(expected arm64 armv7 i386 x86_64)
- endif()
+ set(expected arm64 armv7 i386 x86_64)
if(NOT actual STREQUAL expected)
message(SEND_ERROR
diff --git a/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake b/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake
index 6abba49..fc830b1 100644
--- a/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake
+++ b/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake
@@ -7,11 +7,7 @@ set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT "dwarf")
set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "NO")
-if(XCODE_VERSION VERSION_GREATER_EQUAL 9)
- set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
-else()
- set(CMAKE_OSX_ARCHITECTURES "armv7;arm64;i386;x86_64")
-endif()
+set(CMAKE_OSX_ARCHITECTURES "armv7;arm64;i386;x86_64")
add_executable(foo_app MACOSX_BUNDLE main.cpp)
install(TARGETS foo_app BUNDLE DESTINATION bin)
diff --git a/Tests/RunCMake/XcodeProject/XcodeInstallIOS.cmake b/Tests/RunCMake/XcodeProject/XcodeInstallIOS.cmake
index f629f2e..a797410 100644
--- a/Tests/RunCMake/XcodeProject/XcodeInstallIOS.cmake
+++ b/Tests/RunCMake/XcodeProject/XcodeInstallIOS.cmake
@@ -6,11 +6,7 @@ set(CMAKE_OSX_SYSROOT iphoneos)
set(XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "NO")
-if(XCODE_VERSION VERSION_GREATER_EQUAL 9)
- set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
-else()
- set(CMAKE_OSX_ARCHITECTURES "armv7;i386")
-endif()
+set(CMAKE_OSX_ARCHITECTURES "armv7;i386")
add_library(foo STATIC foo.cpp)
install(TARGETS foo ARCHIVE DESTINATION lib)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a483b7eac257381a98deb750f516e3e699dfbce4
commit a483b7eac257381a98deb750f516e3e699dfbce4
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Oct 8 18:15:31 2017 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sun Oct 8 18:36:09 2017 +0200
TryRun: do not call strcpy()
diff --git a/Source/cmTryRunCommand.cxx b/Source/cmTryRunCommand.cxx
index dcaa493..932b976 100644
--- a/Source/cmTryRunCommand.cxx
+++ b/Source/cmTryRunCommand.cxx
@@ -4,7 +4,6 @@
#include "cmsys/FStream.hxx"
#include <stdio.h>
-#include <string.h>
#include "cmMakefile.h"
#include "cmState.h"
@@ -191,13 +190,15 @@ void cmTryRunCommand::RunExecutable(const std::string& runArgs,
finalCommand.c_str(), out, out, &retVal, nullptr,
cmSystemTools::OUTPUT_NONE, timeout);
// set the run var
- char retChar[1000];
+ char retChar[16];
+ const char* retStr;
if (worked) {
sprintf(retChar, "%i", retVal);
+ retStr = retChar;
} else {
- strcpy(retChar, "FAILED_TO_RUN");
+ retStr = "FAILED_TO_RUN";
}
- this->Makefile->AddCacheDefinition(this->RunResultVariable, retChar,
+ this->Makefile->AddCacheDefinition(this->RunResultVariable, retStr,
"Result of TRY_RUN",
cmStateEnums::INTERNAL);
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmTryRunCommand.cxx | 9 ++++----
Tests/RunCMake/XcodeProject/RunCMakeTest.cmake | 23 ++++++++++++++------
Tests/RunCMake/XcodeProject/XcodeBundles.cmake | 6 +----
.../XcodeIOSInstallCombined-install-check.cmake | 6 +----
.../XcodeProject/XcodeIOSInstallCombined.cmake | 6 +----
Tests/RunCMake/XcodeProject/XcodeInstallIOS.cmake | 6 +----
6 files changed, 25 insertions(+), 31 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list