[Cmake-commits] CMake branch, master, updated. v3.5.1-329-g60de9b8
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 60de9b8a4fe6ceb99682ef7e63e73a592506d158 (commit) from d29004756fa314119a91821a14eef81a2ffcf40a (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=60de9b8a4fe6ceb99682ef7e63e73a592506d158 commit 60de9b8a4fe6ceb99682ef7e63e73a592506d158 Author: Kitware Robot AuthorDate: Tue Mar 29 00:01:05 2016 -0400 Commit: Kitware Robot CommitDate: Tue Mar 29 00:01:05 2016 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index ea1b7ac..6235b66 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 5) -set(CMake_VERSION_PATCH 20160328) +set(CMake_VERSION_PATCH 20160329) #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
[Cmake-commits] CMake branch, next, updated. v3.5.1-673-gae8dbb9
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 ae8dbb9d619d83104c5afa9029b084064ae8c566 (commit)
via 1fe004eac3c5b905cb620580c3258ca3bd455c18 (commit)
from 2d932b45dc63e8fb0f43fdcb9f69a6d020e553da (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=ae8dbb9d619d83104c5afa9029b084064ae8c566
commit ae8dbb9d619d83104c5afa9029b084064ae8c566
Merge: 2d932b4 1fe004e
Author: Domen Vrankar
AuthorDate: Mon Mar 28 18:52:25 2016 -0400
Commit: CMake Topic Stage
CommitDate: Mon Mar 28 18:52:25 2016 -0400
Merge topic 'cpack-rpm-default-user-and-group' into next
1fe004ea cpack rpm setting of defattr
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1fe004eac3c5b905cb620580c3258ca3bd455c18
commit 1fe004eac3c5b905cb620580c3258ca3bd455c18
Author: Domen Vrankar
AuthorDate: Tue Mar 29 00:51:18 2016 +0200
Commit: Domen Vrankar
CommitDate: Tue Mar 29 00:51:18 2016 +0200
cpack rpm setting of defattr
RPM supports setting of default user, group,
file and directory permissions that will be
applied for files in package unless specified
per file/dir with attr setting
This is related to bug report 14714
diff --git a/Help/release/dev/cpack-rpm-default-user-and-group.rst
b/Help/release/dev/cpack-rpm-default-user-and-group.rst
new file mode 100644
index 000..7667c7f
--- /dev/null
+++ b/Help/release/dev/cpack-rpm-default-user-and-group.rst
@@ -0,0 +1,9 @@
+cpack-rpm-default-user-and-group
+
+
+* The "CPackRPM" module learned how to set default values for owning user/group
+ and file/directory permissions of package content.
+ See :variable:`CPACK_RPM_DEFAULT_USER`, :variable:`CPACK_RPM_DEFAULT_GROUP`,
+ :variable:`CPACK_RPM_DEFAULT_FILE_PERMISSIONS`,
+ :variable:`CPACK_RPM_DEFAULT_DIR_PERMISSIONS` and their per component
+ counterparts.
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 7ffec13..ae51dc1 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -531,6 +531,54 @@
# - /usr/share/doc/.*/man/man.*
# - /usr/lib/.*/man/man.*
#
+# .. variable:: CPACK_RPM_DEFAULT_USER
+# CPACK_RPM__DEFAULT_USER
+#
+# default user ownership of RPM content
+#
+# * Mandatory : NO
+# * Default : root
+#
+# Value should be user name and not UID.
+# Note that must be in upper-case.
+#
+# .. variable:: CPACK_RPM_DEFAULT_GROUP
+# CPACK_RPM__DEFAULT_GROUP
+#
+# default group ownership of RPM content
+#
+# * Mandatory : NO
+# * Default : root
+#
+# Value should be group name and not GID.
+# Note that must be in upper-case.
+#
+# .. variable:: CPACK_RPM_DEFAULT_FILE_PERMISSIONS
+# CPACK_RPM__DEFAULT_FILE_PERMISSIONS
+#
+# default permissions used for packaged files
+#
+# * Mandatory : NO
+# * Default : - (system default)
+#
+# Accepted values are lists with PERMISSIONS. Valid permissions
+# are OWNER_READ, OWNER_WRITE, OWNER_EXECUTE, GROUP_READ,
+# GROUP_WRITE, GROUP_EXECUTE, WORLD_READ, WORLD_WRITE and WORLD_EXECUTE.
+# Note that must be in upper-case.
+#
+# .. variable:: CPACK_RPM_DEFAULT_DIR_PERMISSIONS
+# CPACK_RPM__DEFAULT_DIR_PERMISSIONS
+#
+# default permissions used for packaged directories
+#
+# * Mandatory : NO
+# * Default : - (system default)
+#
+# Accepted values are lists with PERMISSIONS. Valid permissions
+# are OWNER_READ, OWNER_WRITE, OWNER_EXECUTE, GROUP_READ,
+# GROUP_WRITE, GROUP_EXECUTE, WORLD_READ, WORLD_WRITE and WORLD_EXECUTE.
+# Note that must be in upper-case.
+#
# Packaging of Symbolic Links
# ^^^
#
@@ -581,6 +629,35 @@
# Author: Eric Noulard with the help of Alexander Neundorf.
+function(get_unix_permissions_octal_notation PERMISSIONS_VAR RETURN_VAR)
+ set(PERMISSIONS ${${PERMISSIONS_VAR}})
+ list(LENGTH PERMISSIONS PERM_LEN_PRE)
+ list(REMOVE_DUPLICATES PERMISSIONS)
+ list(LENGTH PERMISSIONS PERM_LEN_POST)
+
+ if(NOT ${PERM_LEN_PRE} EQUAL ${PERM_LEN_POST})
+message(FATAL_ERROR "${PERMISSIONS_VAR} contains duplicate values.")
+ endif()
+
+ foreach(PERMISSION_TYPE "OWNER" "GROUP" "WORLD")
+set(${PERMISSION_TYPE}_PERMISSIONS 0)
+
+foreach(PERMISSION ${PERMISSIONS})
+ if("${PERMISSION}" STREQUAL "${PERMISSION_TYPE}_READ")
+math(EXPR ${PERMISSION_TYPE}_PERMISSIONS
"${${PERMISSION_TYPE}_PERMISSIONS} + 4")
+ elseif("${PERMISSION}" STREQUAL "${PERMISSION_TYPE}_WRITE")
+math(EXPR ${PERMISSION_TYPE}_PERMISSIONS
"${${PERMISSION_TYPE}_PERMISSIONS} + 2")
+ elseif("${PERMISSION}" STREQUAL "${PERMISSION_TYPE}_EXECUTE")
+
[Cmake-commits] CMake branch, next, updated. v3.5.1-671-g2d932b4
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 2d932b45dc63e8fb0f43fdcb9f69a6d020e553da (commit)
via ed8979540f1f0549bb7ab5432a1a35e46790ba76 (commit)
from 0f364a2b1b134ce79fe62093f959d0d79657a96c (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=2d932b45dc63e8fb0f43fdcb9f69a6d020e553da
commit 2d932b45dc63e8fb0f43fdcb9f69a6d020e553da
Merge: 0f364a2 ed89795
Author: Gregor Jasny
AuthorDate: Mon Mar 28 16:35:33 2016 -0400
Commit: CMake Topic Stage
CommitDate: Mon Mar 28 16:35:33 2016 -0400
Merge topic 'asm-includes' into next
ed897954 Add missing placeholder for ASM languages
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ed8979540f1f0549bb7ab5432a1a35e46790ba76
commit ed8979540f1f0549bb7ab5432a1a35e46790ba76
Author: Gregor Jasny
AuthorDate: Fri Mar 25 23:18:07 2016 +0100
Commit: Gregor Jasny
CommitDate: Fri Mar 25 23:18:07 2016 +0100
Add missing placeholder for ASM languages
Signed-off-by: Gregor Jasny
diff --git a/Modules/CMakeASM-ATTInformation.cmake
b/Modules/CMakeASM-ATTInformation.cmake
index 675c13b..07a2d38 100644
--- a/Modules/CMakeASM-ATTInformation.cmake
+++ b/Modules/CMakeASM-ATTInformation.cmake
@@ -19,7 +19,7 @@ set(ASM_DIALECT "-ATT")
# assembler but should be processed by gcc
set(CMAKE_ASM${ASM_DIALECT}_SOURCE_FILE_EXTENSIONS s;asm)
-set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "
-o ")
+set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "
-o ")
include(CMakeASMInformation)
set(ASM_DIALECT)
diff --git a/Modules/CMakeASM_NASMInformation.cmake
b/Modules/CMakeASM_NASMInformation.cmake
index 7058fc7..146f412 100644
--- a/Modules/CMakeASM_NASMInformation.cmake
+++ b/Modules/CMakeASM_NASMInformation.cmake
@@ -38,7 +38,7 @@ if(NOT CMAKE_ASM_NASM_OBJECT_FORMAT)
endif()
endif()
-set(CMAKE_ASM_NASM_COMPILE_OBJECT " -f
${CMAKE_ASM_NASM_OBJECT_FORMAT} -o ")
+set(CMAKE_ASM_NASM_COMPILE_OBJECT "
-f ${CMAKE_ASM_NASM_OBJECT_FORMAT} -o ")
# Load the generic ASMInformation file:
set(ASM_DIALECT "_NASM")
diff --git a/Modules/Compiler/ARMCC-ASM.cmake b/Modules/Compiler/ARMCC-ASM.cmake
index 8e3cfc5..539d525 100644
--- a/Modules/Compiler/ARMCC-ASM.cmake
+++ b/Modules/Compiler/ARMCC-ASM.cmake
@@ -3,5 +3,5 @@ include(Compiler/ARMCC)
set(CMAKE_ASM_OUTPUT_EXTENSION ".o")
set(CMAKE_ASM_OUTPUT_EXTENSION_REPLACE 1)
-set(CMAKE_ASM_COMPILE_OBJECT " -o
")
+set(CMAKE_ASM_COMPILE_OBJECT " -o
")
set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s;asm;msa)
diff --git a/Modules/Platform/Generic-ADSP-ASM.cmake
b/Modules/Platform/Generic-ADSP-ASM.cmake
index 63a1388..e718bec 100644
--- a/Modules/Platform/Generic-ADSP-ASM.cmake
+++ b/Modules/Platform/Generic-ADSP-ASM.cmake
@@ -3,5 +3,5 @@ include(Platform/Generic-ADSP-Common)
set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS asm)
set(CMAKE_ASM_OUTPUT_EXTENSION ".doj" )
set(CMAKE_ASM_COMPILE_OBJECT
-" -proc ${ADSP_PROCESSOR} -si-revision
${ADSP_PROCESSOR_SILICIUM_REVISION} -o ")
+" -proc ${ADSP_PROCESSOR}
-si-revision ${ADSP_PROCESSOR_SILICIUM_REVISION} -o ")
diff --git a/Modules/Platform/gas.cmake b/Modules/Platform/gas.cmake
index 7d2bc84..7c659f2 100644
--- a/Modules/Platform/gas.cmake
+++ b/Modules/Platform/gas.cmake
@@ -4,7 +4,7 @@ else()
set(CMAKE_ASM${ASM_DIALECT}_OUTPUT_EXTENSION .obj)
endif()
-set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "
-o ")
+set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "
-o ")
set(CMAKE_ASM${ASM_DIALECT}_CREATE_STATIC_LIBRARY
" cr"
---
Summary of changes:
Modules/CMakeASM-ATTInformation.cmake |2 +-
Modules/CMakeASM_NASMInformation.cmake |2 +-
Modules/Compiler/ARMCC-ASM.cmake|2 +-
Modules/Platform/Generic-ADSP-ASM.cmake |2 +-
Modules/Platform/gas.cmake |2 +-
5 files changed, 5 insertions(+), 5 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.5.1-669-g0f364a2
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 0f364a2b1b134ce79fe62093f959d0d79657a96c (commit)
via 36ad8dd440069b126ca28dccf57e8c65188c693b (commit)
via 230d50ed1a1bbeac3b840ecc2d45c1b8710c8be4 (commit)
from 3884580aabce46aaff070ebbae61fac320552410 (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=0f364a2b1b134ce79fe62093f959d0d79657a96c
commit 0f364a2b1b134ce79fe62093f959d0d79657a96c
Merge: 3884580 36ad8dd
Author: Brad King
AuthorDate: Mon Mar 28 13:26:09 2016 -0400
Commit: CMake Topic Stage
CommitDate: Mon Mar 28 13:26:09 2016 -0400
Merge topic 'ghs-link-flags' into next
36ad8dd4 GHS: Implement link flags and dirs for non-target groups (#16029)
230d50ed GHS: Factor out compiler information shared among languages
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=36ad8dd440069b126ca28dccf57e8c65188c693b
commit 36ad8dd440069b126ca28dccf57e8c65188c693b
Author: Geoff Viola
AuthorDate: Sat Mar 26 21:28:31 2016 -0600
Commit: Brad King
CommitDate: Mon Mar 28 11:46:46 2016 -0400
GHS: Implement link flags and dirs for non-target groups (#16029)
diff --git a/Modules/Compiler/GHS.cmake b/Modules/Compiler/GHS.cmake
index cfc29c2..e6a867d 100644
--- a/Modules/Compiler/GHS.cmake
+++ b/Modules/Compiler/GHS.cmake
@@ -4,3 +4,5 @@ endif()
set(__COMPILER_GHS 1)
set(CMAKE_EXECUTABLE_SUFFIX ".as")
+set(CMAKE_LIBRARY_PATH_TERMINATOR "\n")
+set(CMAKE_LIBRARY_PATH_FLAG " -L")
diff --git a/Source/cmGhsMultiTargetGenerator.cxx
b/Source/cmGhsMultiTargetGenerator.cxx
index c5813ba..1f17f8f 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -149,7 +149,7 @@ void cmGhsMultiTargetGenerator::Generate()
this->WriteIncludes(config, language);
if (this->GeneratorTarget->GetType() == cmState::EXECUTABLE)
{
- this->WriteTargetLinkLibraries();
+ this->WriteTargetLinkLibraries(config, language);
}
this->WriteCustomCommands();
@@ -365,7 +365,8 @@ void cmGhsMultiTargetGenerator::WriteIncludes(const
std::string &config,
}
}
-void cmGhsMultiTargetGenerator::WriteTargetLinkLibraries()
+void cmGhsMultiTargetGenerator::WriteTargetLinkLibraries(
+ std::string const& config, std::string const& language)
{
// library directories
cmTargetDependSet tds =
@@ -393,6 +394,35 @@ void cmGhsMultiTargetGenerator::WriteTargetLinkLibraries()
*this->GetFolderBuildStreams() << "-l\"" << libName << "\""
<< std::endl;
}
+
+ if (!this->TargetGroup)
+{
+std::string linkLibraries;
+std::string flags;
+std::string linkFlags;
+std::string frameworkPath;
+std::string linkPath;
+std::string createRule =
+this->GeneratorTarget->GetCreateRuleVariable(language, config);
+bool useWatcomQuote =
+this->Makefile->IsOn(createRule + "_USE_WATCOM_QUOTE");
+this->LocalGenerator->GetTargetFlags(
+ linkLibraries, flags, linkFlags,
+ frameworkPath, linkPath,
+ this->GeneratorTarget, useWatcomQuote);
+linkFlags = cmSystemTools::TrimWhitespace(linkFlags);
+
+if (!linkPath.empty())
+ {
+ linkPath = " " + linkPath.substr(0U, linkPath.size() - 1U);
+ *this->GetFolderBuildStreams() << linkPath;
+ }
+
+if (!linkFlags.empty())
+ {
+ *this->GetFolderBuildStreams() << "" << linkFlags << std::endl;
+ }
+}
}
void cmGhsMultiTargetGenerator::WriteCustomCommands()
diff --git a/Source/cmGhsMultiTargetGenerator.h
b/Source/cmGhsMultiTargetGenerator.h
index 327fdef..e85e412 100644
--- a/Source/cmGhsMultiTargetGenerator.h
+++ b/Source/cmGhsMultiTargetGenerator.h
@@ -81,7 +81,8 @@ private:
std::string const &config);
void WriteIncludes(const std::string &config, const std::string &language);
- void WriteTargetLinkLibraries();
+ void WriteTargetLinkLibraries(std::string const& config,
+std::string const& language);
void WriteCustomCommands();
void
WriteCustomCommandsHelper(std::vector const &commandsSet,
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=230d50ed1a1bbeac3b840ecc2d45c1b8710c8be4
commit 230d50ed1a1bbeac3b840ecc2d45c1b8710c8be4
Author: Geoff Viola
AuthorDate: Sat Mar 26 21:28:31 2016 -0600
Commit: Brad King
CommitDate: Mon Mar 28 11:44:58 2016 -0400
GHS: Factor out compiler information shared among languages
Move common information in `Modules/Compiler/GHS-*.cmake` over to a
common `Modules/Compiler/GHS.cmake` and include it.
diff --git a/Mod
[Cmake-commits] CMake branch, next, updated. v3.5.1-666-g3884580
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 3884580aabce46aaff070ebbae61fac320552410 (commit) via d29004756fa314119a91821a14eef81a2ffcf40a (commit) via 81cec38b99ce2a68a57b81fa138351f85a4536c9 (commit) via c69ed0a8844ea5f417fefa758cdbcfc978d89712 (commit) via aa9227aa4d2ff415abd7c9a24ff0cc21d9721640 (commit) via 6732749e5b89198ed391b516ee57d835893e723d (commit) via 9b5652846f131f188f919b6d5f7a906d43d2969a (commit) from e5d7429c7033f1e67833fc55689f14cbd23146b8 (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=3884580aabce46aaff070ebbae61fac320552410 commit 3884580aabce46aaff070ebbae61fac320552410 Merge: e5d7429 d290047 Author: Brad King AuthorDate: Mon Mar 28 09:25:58 2016 -0400 Commit: Brad King CommitDate: Mon Mar 28 09:25:58 2016 -0400 Merge branch 'master' into next --- 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
[Cmake-commits] CMake branch, master, updated. v3.5.1-328-gd290047
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 d29004756fa314119a91821a14eef81a2ffcf40a (commit) via c41b9dc7b5d9e38ec89c5865ee7a8d6409ad4dea (commit) from 81cec38b99ce2a68a57b81fa138351f85a4536c9 (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=d29004756fa314119a91821a14eef81a2ffcf40a commit d29004756fa314119a91821a14eef81a2ffcf40a Merge: 81cec38 c41b9dc Author: Brad King AuthorDate: Mon Mar 28 09:25:45 2016 -0400 Commit: CMake Topic Stage CommitDate: Mon Mar 28 09:25:45 2016 -0400 Merge topic 'test-fix-FindGTK2-cxx11' c41b9dc7 Tests: Fix GTK2Components.gtkmm test with sigc++ >= 2.5.1 --- Summary of changes: Tests/FindGTK2/gtkmm/CMakeLists.txt |5 + 1 file changed, 5 insertions(+) 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.5.1-324-gc69ed0a
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 c69ed0a8844ea5f417fefa758cdbcfc978d89712 (commit) via 06b7f5d2cac5e697b503337e870e34b11a592bd1 (commit) from aa9227aa4d2ff415abd7c9a24ff0cc21d9721640 (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=c69ed0a8844ea5f417fefa758cdbcfc978d89712 commit c69ed0a8844ea5f417fefa758cdbcfc978d89712 Merge: aa9227a 06b7f5d Author: Brad King AuthorDate: Mon Mar 28 09:25:40 2016 -0400 Commit: CMake Topic Stage CommitDate: Mon Mar 28 09:25:40 2016 -0400 Merge topic 'only_change_timeout_once' 06b7f5d2 CTest: Only apply the secondary test timeout once --- Summary of changes: Source/CTest/cmCTestRunTest.cxx |2 ++ 1 file changed, 2 insertions(+) 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.5.1-326-g81cec38
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 81cec38b99ce2a68a57b81fa138351f85a4536c9 (commit) via a364d2513a3fac76cf12cf3db21b7e9600ac51a4 (commit) from c69ed0a8844ea5f417fefa758cdbcfc978d89712 (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=81cec38b99ce2a68a57b81fa138351f85a4536c9 commit 81cec38b99ce2a68a57b81fa138351f85a4536c9 Merge: c69ed0a a364d25 Author: Brad King AuthorDate: Mon Mar 28 09:25:43 2016 -0400 Commit: CMake Topic Stage CommitDate: Mon Mar 28 09:25:43 2016 -0400 Merge topic 'xcode73-xctest-location' a364d251 Xcode: Fixup XCTest bundle location for Xcode 7.3 --- Summary of changes: Modules/FindXCTest.cmake |4 1 file changed, 4 insertions(+) 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.5.1-659-ge5d7429
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 e5d7429c7033f1e67833fc55689f14cbd23146b8 (commit)
via a364d2513a3fac76cf12cf3db21b7e9600ac51a4 (commit)
from 021e01c423475f7c358a50775e0fc4073be8e75c (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=e5d7429c7033f1e67833fc55689f14cbd23146b8
commit e5d7429c7033f1e67833fc55689f14cbd23146b8
Merge: 021e01c a364d25
Author: Brad King
AuthorDate: Mon Mar 28 09:23:54 2016 -0400
Commit: CMake Topic Stage
CommitDate: Mon Mar 28 09:23:54 2016 -0400
Merge topic 'xcode73-xctest-location' into next
a364d251 Xcode: Fixup XCTest bundle location for Xcode 7.3
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a364d2513a3fac76cf12cf3db21b7e9600ac51a4
commit a364d2513a3fac76cf12cf3db21b7e9600ac51a4
Author: Gregor Jasny
AuthorDate: Fri Mar 25 22:20:14 2016 +0100
Commit: Brad King
CommitDate: Mon Mar 28 09:23:35 2016 -0400
Xcode: Fixup XCTest bundle location for Xcode 7.3
Prior to Xcode 7.3 a XCTest bundle was built like an ordinary
bundle. But starting with Xcode 7.3 it is implicitely built as
a plugin for the test host. It looks like in that case the
'Build Products Path' is ignored.
This patch simply sets the CMake target output path to the value
Xcode expects internally to get a matching view of both.
The command:
xcodebuild -showBuildSettings -target CocoaExampleTests -configuration
Debug
Output with Xcode 7.2:
TARGET_BUILD_DIR = .../Tests/XCTest/Debug
Output with Xcode 7.3
TARGET_BUILD_DIR =
.../Tests/XCTest/Debug/CocoaExample.app/Contents/PlugIns
Signed-off-by: Gregor Jasny
diff --git a/Modules/FindXCTest.cmake b/Modules/FindXCTest.cmake
index 3cd9c22..805a58c 100644
--- a/Modules/FindXCTest.cmake
+++ b/Modules/FindXCTest.cmake
@@ -140,6 +140,10 @@ function(xctest_add_bundle target testee)
set_target_properties(${target} PROPERTIES
XCODE_ATTRIBUTE_BUNDLE_LOADER "$(TEST_HOST)"
XCODE_ATTRIBUTE_TEST_HOST "$")
+ if(NOT XCODE_VERSION VERSION_LESS 7.3)
+set_target_properties(${target} PROPERTIES
+ LIBRARY_OUTPUT_DIRECTORY "$/../PlugIns")
+ endif()
else(XCODE)
target_link_libraries(${target}
PRIVATE -bundle_loader $)
---
Summary of changes:
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
