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 6681122a8fd8d93bb49c79d8ba448fc870fd6747 (commit)
via 2a9429bbd2b67c9c639492bafc645ddd1eeee7c7 (commit)
from d0868c9866d1bec94285c51bf2c6258e1c835223 (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=6681122a8fd8d93bb49c79d8ba448fc870fd6747
commit 6681122a8fd8d93bb49c79d8ba448fc870fd6747
Merge: d0868c9 2a9429b
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Jan 9 15:46:49 2017 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Jan 9 15:46:49 2017 -0500
Merge topic '16253-xcode-effective-platform-name' into next
2a9429bb Revert topic '16253-xcode-effective-platform-name'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a9429bbd2b67c9c639492bafc645ddd1eeee7c7
commit 2a9429bbd2b67c9c639492bafc645ddd1eeee7c7
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Jan 9 15:46:26 2017 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Jan 9 15:46:26 2017 -0500
Revert topic '16253-xcode-effective-platform-name'
It needs some revision and test fixes.
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index c2a76e4..b6db0d6 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4419,9 +4419,9 @@ bool cmGeneratorTarget::ComputeOutputDir(const
std::string& config,
// The generator may add the configuration's subdirectory.
if (!conf.empty()) {
- bool useEPN = this->Makefile->ShouldEmitEffectivePlatformName();
+ bool iosPlatform = this->Makefile->PlatformIsAppleIos();
std::string suffix =
- usesDefaultOutputDir && useEPN ? "${EFFECTIVE_PLATFORM_NAME}" : "";
+ usesDefaultOutputDir && iosPlatform ? "${EFFECTIVE_PLATFORM_NAME}" : "";
this->LocalGenerator->GetGlobalGenerator()->AppendDirectoryForConfig(
"/", conf, suffix, out);
}
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index c2767f0..2808051 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2342,8 +2342,8 @@ void cmGlobalGenerator::AddGlobalTarget_Install(
singleLine.push_back(cmd);
if (cmakeCfgIntDir && *cmakeCfgIntDir && cmakeCfgIntDir[0] != '.') {
std::string cfgArg = "-DBUILD_TYPE=";
- bool useEPN = mf->ShouldEmitEffectivePlatformName();
- if (useEPN) {
+ bool iosPlatform = mf->PlatformIsAppleIos();
+ if (iosPlatform) {
cfgArg += "$(CONFIGURATION)";
singleLine.push_back(cfgArg);
cfgArg = "-DEFFECTIVE_PLATFORM_NAME=$(EFFECTIVE_PLATFORM_NAME)";
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 0656b0a..fccb486 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2184,22 +2184,6 @@ bool cmMakefile::PlatformIsAppleIos() const
return false;
}
-bool cmMakefile::ShouldEmitEffectivePlatformName() const
-{
- bool isXcode = this->IsOn("XCODE");
- if (!isXcode) {
- return false;
- }
-
- const char* xcodeVersion = this->GetDefinition("XCODE_VERSION");
- if (!xcodeVersion ||
- cmSystemTools::VersionCompareGreater("5", xcodeVersion)) {
- return false;
- }
-
- return true;
-}
-
const char* cmMakefile::GetSONameFlag(const std::string& language) const
{
std::string name = "CMAKE_SHARED_LIBRARY_SONAME";
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index f929951..3484e5a 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -427,9 +427,6 @@ public:
/** Return whether the target platform is Apple iOS. */
bool PlatformIsAppleIos() const;
- /** Return whether the generator should use EFFECTIVE_PLATFORM_NAME. */
- bool ShouldEmitEffectivePlatformName() const;
-
/** Retrieve soname flag for the specified language if supported */
const char* GetSONameFlag(const std::string& language) const;
diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
index 57766db..60912c2 100644
--- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
+++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
@@ -18,27 +18,6 @@ run_cmake(PerConfigPerSourceFlags)
# Use a single build tree for a few tests without cleaning.
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)
-
- file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
- file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
-
- run_cmake(XcodeMultiplatform)
-
- run_cmake_command(XcodeMultiplatform-macosx-build ${CMAKE_COMMAND} --build .
-- -sdk macosx)
- run_cmake_command(XcodeMultiplatform-iphonesimulator-build ${CMAKE_COMMAND}
--build . -- -sdk iphonesimulator)
-
- run_cmake_command(XcodeMultiplatform-macosx-install ${CMAKE_COMMAND} --build
. --target install -- -sdk macosx
DESTDIR=${RunCMake_TEST_BINARY_DIR}/_install_macosx)
- run_cmake_command(XcodeMultiplatform-iphonesimulator-install
${CMAKE_COMMAND} --build . --target install -- -sdk iphonesimulator
DESTDIR=${RunCMake_TEST_BINARY_DIR}/_install_iphonesimulator)
-
- unset(RunCMake_TEST_BINARY_DIR)
- unset(RunCMake_TEST_NO_CLEAN)
- unset(RunCMake_TEST_OPTIONS)
-endif()
-
-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")
diff --git a/Tests/RunCMake/XcodeProject/XcodeMultiplatform.cmake
b/Tests/RunCMake/XcodeProject/XcodeMultiplatform.cmake
deleted file mode 100644
index 166ce85..0000000
--- a/Tests/RunCMake/XcodeProject/XcodeMultiplatform.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-cmake_minimum_required(VERSION 3.3)
-enable_language(CXX)
-
-set(CMAKE_XCODE_ATTRIBUTE_SUPPORTED_PLATFORMS "macosx iphonesimulator")
-set(CMAKE_MACOSX_BUNDLE true)
-
-add_library(library STATIC foo.cpp)
-
-add_executable(main main.cpp)
-target_link_libraries(main library)
-
-install(TARGETS library ARCHIVE DESTINATION lib)
-----------------------------------------------------------------------
Summary of changes:
Source/cmGeneratorTarget.cxx | 4 ++--
Source/cmGlobalGenerator.cxx | 4 ++--
Source/cmMakefile.cxx | 16 ---------------
Source/cmMakefile.h | 3 ---
Tests/RunCMake/XcodeProject/RunCMakeTest.cmake | 21 --------------------
.../RunCMake/XcodeProject/XcodeMultiplatform.cmake | 12 -----------
6 files changed, 4 insertions(+), 56 deletions(-)
delete mode 100644 Tests/RunCMake/XcodeProject/XcodeMultiplatform.cmake
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
