[Cmake-commits] CMake branch, next, updated. v3.3.0-1849-gc783951
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 c783951c1fa1f6508145a845b0a00b2d1b17eeb0 (commit)
via 133ea6a940d698a75c118c5d3e7350c472f6e8fb (commit)
via 5cc55b9331b7b8844c331657ac60c3293dce9fc3 (commit)
from 176546cf838362e249598060cedf57d1365940f4 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c783951c1fa1f6508145a845b0a00b2d1b17eeb0
commit c783951c1fa1f6508145a845b0a00b2d1b17eeb0
Merge: 176546c 133ea6a
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Aug 4 09:49:04 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Aug 4 09:49:04 2015 -0400
Merge topic 'use-generator-target' into next
133ea6a9 Revert cmGlobalGenerator: Base exclusion computation on
cmGeneratorTarget.
5cc55b93 Revert cmMakefile: Remove unused method.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=133ea6a940d698a75c118c5d3e7350c472f6e8fb
commit 133ea6a940d698a75c118c5d3e7350c472f6e8fb
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Aug 4 09:32:42 2015 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Aug 4 09:33:33 2015 -0400
Revert cmGlobalGenerator: Base exclusion computation on cmGeneratorTarget.
This reverts commit ffc27b83b4f3a31c1c38cdc7edc8a6d37ed1977d.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index b14949a..1d6608b 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2022,10 +2022,10 @@ bool cmGlobalGenerator::IsExcluded(cmLocalGenerator*
root,
}
bool cmGlobalGenerator::IsExcluded(cmLocalGenerator* root,
- cmGeneratorTarget* target) const
+ cmTarget const target) const
{
- if(target-GetType() == cmTarget::INTERFACE_LIBRARY
- || target-Target-GetPropertyAsBool(EXCLUDE_FROM_ALL))
+ if(target.GetType() == cmTarget::INTERFACE_LIBRARY
+ || target.GetPropertyAsBool(EXCLUDE_FROM_ALL))
{
// This target is excluded from its directory.
return true;
@@ -2034,7 +2034,7 @@ bool cmGlobalGenerator::IsExcluded(cmLocalGenerator* root,
{
// This target is included in its directory. Check whether the
// directory is excluded.
-return this-IsExcluded(root, target-GetLocalGenerator());
+return this-IsExcluded(root, target.GetMakefile()-GetLocalGenerator());
}
}
@@ -2095,16 +2095,15 @@ void cmGlobalGenerator::FillLocalGeneratorToTargetMap()
{
cmTarget const target = t-second;
- cmGeneratorTarget* gt = this-GetGeneratorTarget(target);
-
// Consider the directory containing the target and all its
// parents until something excludes the target.
- for(cmLocalGenerator* clg = lg; clg !this-IsExcluded(clg, gt);
+ for(cmLocalGenerator* clg = lg; clg !this-IsExcluded(clg, target);
clg = clg-GetParent())
{
// This local generator includes the target.
std::setcmGeneratorTarget const* targetSet =
this-LocalGeneratorToTargetMap[clg];
+cmGeneratorTarget* gt = this-GetGeneratorTarget(target);
targetSet.insert(gt);
// Add dependencies of the included target. An excluded
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 3be76b6..9492372 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -398,7 +398,7 @@ protected:
void FillProjectMap();
void CheckLocalGenerators();
bool IsExcluded(cmLocalGenerator* root, cmLocalGenerator* gen) const;
- bool IsExcluded(cmLocalGenerator* root, cmGeneratorTarget* target) const;
+ bool IsExcluded(cmLocalGenerator* root, cmTarget const target) const;
void FillLocalGeneratorToTargetMap();
void CreateDefaultGlobalTargets(cmTargets* targets);
cmTarget CreateGlobalTarget(const std::string name, const char* message,
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index 47822b4..2a749c1 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -289,7 +289,7 @@ public:
const std::vectorcmLocalGenerator* GetLocalGenerators() const {
return LocalGenerators; }
- bool IsExcluded(cmLocalGenerator* root, cmGeneratorTarget* target) {
+ bool IsExcluded(cmLocalGenerator* root, cmTarget target) {
return cmGlobalGenerator::IsExcluded(root, target); }
int GetRuleCmdLength(const std::string name) {
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx
b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 76d059ee..69747a4 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
[Cmake-commits] CMake branch, master, updated. v3.3.0-682-g4a1173f
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 4a1173fda09afe8fd861b45b77d83260cec688df (commit) via 975426ceb339cf7a17f57ffba2757bb368669f93 (commit) from 331e791a3e18d8335960c0161d30dbe04e3a6fe5 (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4a1173fda09afe8fd861b45b77d83260cec688df commit 4a1173fda09afe8fd861b45b77d83260cec688df Merge: 331e791 975426c Author: Brad King brad.k...@kitware.com AuthorDate: Tue Aug 4 09:15:08 2015 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Aug 4 09:15:08 2015 -0400 Merge topic 'cmake-W-options' 975426ce cmake: Do not treat developer warnings as errors by default in scripts --- Summary of changes: Source/cmMessageCommand.cxx |2 +- Source/cmake.cxx| 10 +- 2 files changed, 6 insertions(+), 6 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.3.0-1846-g176546c
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 176546cf838362e249598060cedf57d1365940f4 (commit) via 87b869c1da77f673f6397eff48b09cfb5f44f5f9 (commit) via 258470bd367552994ba61b8746e04d1514ac34a6 (commit) via 4a1173fda09afe8fd861b45b77d83260cec688df (commit) via 331e791a3e18d8335960c0161d30dbe04e3a6fe5 (commit) from 3c77f9ca3a67d5c94251154a391991b8b2146be5 (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=176546cf838362e249598060cedf57d1365940f4 commit 176546cf838362e249598060cedf57d1365940f4 Merge: 3c77f9c 87b869c Author: Brad King brad.k...@kitware.com AuthorDate: Tue Aug 4 09:15:21 2015 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Aug 4 09:15:21 2015 -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.3.0-687-g87b869c
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 87b869c1da77f673f6397eff48b09cfb5f44f5f9 (commit) via 3da431379bae33374edd7c62c6f4261b4e3a663f (commit) via 9a59ae5c198f7c413bcaf29f1ab107a265677b95 (commit) from 258470bd367552994ba61b8746e04d1514ac34a6 (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=87b869c1da77f673f6397eff48b09cfb5f44f5f9 commit 87b869c1da77f673f6397eff48b09cfb5f44f5f9 Merge: 258470b 3da4313 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Aug 4 09:15:12 2015 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Aug 4 09:15:12 2015 -0400 Merge topic 'update-kwsys' 3da43137 Merge branch 'upstream-kwsys' into update-kwsys 9a59ae5c KWSys 2015-08-03 (dad68c33) --- Summary of changes: Source/kwsys/EncodingC.c | 14 ++ Source/kwsys/SystemTools.cxx | 18 -- Source/kwsys/testSystemTools.cxx | 22 ++ 3 files changed, 48 insertions(+), 6 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, master, updated. v3.3.0-684-g258470b
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 258470bd367552994ba61b8746e04d1514ac34a6 (commit)
via d951f5429a116e6174f9cdb983945cb01cf37553 (commit)
from 4a1173fda09afe8fd861b45b77d83260cec688df (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=258470bd367552994ba61b8746e04d1514ac34a6
commit 258470bd367552994ba61b8746e04d1514ac34a6
Merge: 4a1173f d951f54
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Aug 4 09:15:10 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Aug 4 09:15:10 2015 -0400
Merge topic 'doc-ninja-rule-launchers'
d951f542 Help: Refine RULE_LAUNCH_{COMPILE,CUSTOM,LINK} global property docs
---
Summary of changes:
Help/prop_gbl/RULE_LAUNCH_COMPILE.rst | 10 ++
Help/prop_gbl/RULE_LAUNCH_CUSTOM.rst | 10 ++
Help/prop_gbl/RULE_LAUNCH_LINK.rst| 10 ++
3 files changed, 18 insertions(+), 12 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.3.0-1851-g97b5cdd
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 97b5cddf8e80efbca9ecfe324aed94e27225618c (commit)
via cfd751f140d546810fc2fa718f00a069e18ea1fd (commit)
from c783951c1fa1f6508145a845b0a00b2d1b17eeb0 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=97b5cddf8e80efbca9ecfe324aed94e27225618c
commit 97b5cddf8e80efbca9ecfe324aed94e27225618c
Merge: c783951 cfd751f
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Aug 4 11:19:16 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Aug 4 11:19:16 2015 -0400
Merge topic 'java-updates' into next
cfd751f1 Revise topic 'java-updates'
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cfd751f140d546810fc2fa718f00a069e18ea1fd
commit cfd751f140d546810fc2fa718f00a069e18ea1fd
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Aug 4 11:18:23 2015 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Aug 4 11:18:23 2015 -0400
Revise topic 'java-updates'
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index bc8373b..5781a9e 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -3011,26 +3011,27 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
add_test(Java.Jar ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/Java
- ${CMake_BINARY_DIR}/Tests/Java
+ ${CMake_BINARY_DIR}/Tests/JavaJar
${build_generator_args}
--build-project hello
--build-target hello
--build-two-config
- --build-run-dir ${CMake_BINARY_DIR}/Tests/Java/
+ --build-run-dir ${CMake_BINARY_DIR}/Tests/JavaJar/
--build-options ${build_options}
--test-command ${JAVA_RUNTIME} -classpath hello.jar HelloWorld)
+list(APPEND TEST_BUILD_DIRS ${CMake_BINARY_DIR}/Tests/JavaJar)
add_test(Java.JarSourceList ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/Java
- ${CMake_BINARY_DIR}/Tests/Java
+ ${CMake_BINARY_DIR}/Tests/JavaJarSourceList
${build_generator_args}
--build-project hello
--build-target hello2
--build-two-config
- --build-run-dir ${CMake_BINARY_DIR}/Tests/Java/
+ --build-run-dir ${CMake_BINARY_DIR}/Tests/JavaJarSourceList/
--build-options ${build_options}
--test-command ${JAVA_RUNTIME} -classpath hello2.jar HelloWorld)
-list(APPEND TEST_BUILD_DIRS ${CMake_BINARY_DIR}/Tests/Java)
+list(APPEND TEST_BUILD_DIRS
${CMake_BINARY_DIR}/Tests/JavaJarSourceList)
endif()
endif()
endif()
---
Summary of changes:
Tests/CMakeLists.txt | 11 ++-
1 file changed, 6 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.3.0-1855-ga62d22e
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 a62d22ed4cf8be3e53718add6be1c4dd7db2922e (commit)
via cc23f0e9d38fe3f880ada549af4e552fc13fc655 (commit)
via 3d287de4ea99718ffe2ac6b855c2786d67946be2 (commit)
via e72806fb30dd9162aa1b05cb478ae51d1ecd27fa (commit)
from 97b5cddf8e80efbca9ecfe324aed94e27225618c (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a62d22ed4cf8be3e53718add6be1c4dd7db2922e
commit a62d22ed4cf8be3e53718add6be1c4dd7db2922e
Merge: 97b5cdd cc23f0e
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Aug 4 11:20:57 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Aug 4 11:20:57 2015 -0400
Merge topic 'java-updates' into next
cc23f0e9 UseJava: Teach install_jar new DESTINATION and COMPONENT options
3d287de4 UseJava: Teach add_jar to support file syntax for sources
e72806fb FindJava: Add support for idlj and jarsigner tools
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cc23f0e9d38fe3f880ada549af4e552fc13fc655
commit cc23f0e9d38fe3f880ada549af4e552fc13fc655
Author: Marc Chevrier marc.chevr...@sap.com
AuthorDate: Thu Jul 30 11:19:24 2015 +0200
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Aug 4 11:19:44 2015 -0400
UseJava: Teach install_jar new DESTINATION and COMPONENT options
diff --git a/Help/release/dev/java-updates.rst
b/Help/release/dev/java-updates.rst
index 2e5e184..b777807 100644
--- a/Help/release/dev/java-updates.rst
+++ b/Help/release/dev/java-updates.rst
@@ -7,3 +7,7 @@ java-updates
* The :module:`UseJava` module ``add_jar`` function learned
to support response files (e.g. ``@srcs.txt``) for source
specification.
+
+* The :module:`UseJava` module ``install_jar`` function learned
+ new ``DESTINATION`` and ``COMPONENT`` options to specify
+ the corresponding :command:`install` command options.
diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake
index 0add8d2..c61591d 100644
--- a/Modules/UseJava.cmake
+++ b/Modules/UseJava.cmake
@@ -211,14 +211,16 @@
#
# ::
#
-# install_jar(TARGET_NAME DESTINATION)
+# install_jar(target_name destination)
+# install_jar(target_name DESTINATION destination [COMPONENT component])
#
# This command installs the TARGET_NAME files to the given DESTINATION.
# It should be called in the same scope as add_jar() or it will fail.
#
# ::
#
-# install_jni_symlink(TARGET_NAME DESTINATION)
+# install_jni_symlink(target_name destination)
+# install_jni_symlink(target_name DESTINATION destination [COMPONENT
component])
#
# This command installs the TARGET_NAME JNI symlinks to the given
# DESTINATION. It should be called in the same scope as add_jar() or it
@@ -629,7 +631,26 @@ function(add_jar _TARGET_NAME)
endfunction()
-function(INSTALL_JAR _TARGET_NAME _DESTINATION)
+function(INSTALL_JAR _TARGET_NAME)
+if (ARGC EQUAL 2)
+ set (_DESTINATION ${ARGV1})
+else()
+ cmake_parse_arguments(_install_jar
+
+DESTINATION;COMPONENT
+
+${ARGN})
+ if (_install_jar_DESTINATION)
+set (_DESTINATION ${_install_jar_DESTINATION})
+ else()
+message(SEND_ERROR install_jar: ${_TARGET_NAME}: DESTINATION must be
specified.)
+ endif()
+
+ if (_install_jar_COMPONENT)
+set (_COMPONENT COMPONENT ${_install_jar_COMPONENT})
+ endif()
+endif()
+
get_property(__FILES
TARGET
${_TARGET_NAME}
@@ -643,13 +664,33 @@ function(INSTALL_JAR _TARGET_NAME _DESTINATION)
${__FILES}
DESTINATION
${_DESTINATION}
+${_COMPONENT}
)
else ()
-message(SEND_ERROR The target ${_TARGET_NAME} is not known in this
scope.)
+message(SEND_ERROR install_jar: The target ${_TARGET_NAME} is not
known in this scope.)
endif ()
endfunction()
-function(INSTALL_JNI_SYMLINK _TARGET_NAME _DESTINATION)
+function(INSTALL_JNI_SYMLINK _TARGET_NAME)
+if (ARGC EQUAL 2)
+ set (_DESTINATION ${ARGV1})
+else()
+ cmake_parse_arguments(_install_jni_symlink
+
+DESTINATION;COMPONENT
+
+${ARGN})
+ if (_install_jni_symlink_DESTINATION)
+set (_DESTINATION ${_install_jni_symlink_DESTINATION})
+ else()
+message(SEND_ERROR install_jni_symlink: ${_TARGET_NAME}: DESTINATION
must be specified.)
+ endif()
+
+ if (_install_jni_symlink_COMPONENT)
+set (_COMPONENT COMPONENT ${_install_jni_symlink_COMPONENT})
+ endif()
+endif()
+
get_property(__SYMLINK
TARGET
[Cmake-commits] CMake branch, master, updated. v3.3.0-688-ga15b69c
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 a15b69cbc75f475601f41c516330c679915676e4 (commit) from 87b869c1da77f673f6397eff48b09cfb5f44f5f9 (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a15b69cbc75f475601f41c516330c679915676e4 commit a15b69cbc75f475601f41c516330c679915676e4 Author: Kitware Robot kwro...@kitware.com AuthorDate: Wed Aug 5 00:01:06 2015 -0400 Commit: Kitware Robot kwro...@kitware.com CommitDate: Wed Aug 5 00:01:06 2015 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 9a7ae8b..a9dfae0 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 3) -set(CMake_VERSION_PATCH 20150804) +set(CMake_VERSION_PATCH 20150805) #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.3.0-1895-gc06c74f
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 c06c74f32f5318789bd72ddb41cec9759d6a9339 (commit)
via adecd54b8a3e357489c2492898a5594217e4db29 (commit)
via c635339b0039d677100f7212ed02d8f0dc3f492d (commit)
from e12067e28975b01aca849ee1d55656d3ba23c694 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c06c74f32f5318789bd72ddb41cec9759d6a9339
commit c06c74f32f5318789bd72ddb41cec9759d6a9339
Merge: e12067e adecd54
Author: Gregor Jasny gja...@googlemail.com
AuthorDate: Tue Aug 4 16:47:05 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Aug 4 16:47:05 2015 -0400
Merge topic 'fix-xcode-quoting' into next
adecd54b Xcode: Invert quoting logic to whitelist of characters
c635339b Xcode: quote more characters
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=adecd54b8a3e357489c2492898a5594217e4db29
commit adecd54b8a3e357489c2492898a5594217e4db29
Author: Gregor Jasny gja...@googlemail.com
AuthorDate: Sun Aug 2 00:06:49 2015 +0200
Commit: Gregor Jasny gja...@googlemail.com
CommitDate: Sun Aug 2 00:16:39 2015 +0200
Xcode: Invert quoting logic to whitelist of characters
The problem with the list of characters which triggers quoting
is that it does not with UTF-8 characters which are not in the
7 bit table. Therefore the quoting decision is reversed:
Do not quote if all characters found in the string are in the
whitelist.
diff --git a/Source/cmXCodeObject.cxx b/Source/cmXCodeObject.cxx
index 4041d26..c59c360 100644
--- a/Source/cmXCodeObject.cxx
+++ b/Source/cmXCodeObject.cxx
@@ -243,7 +243,11 @@ void cmXCodeObject::PrintString(std::ostream
os,std::string String)
bool needQuote =
(String.empty() ||
String.find(//) != String.npos ||
- String.find_first_of( +-*=@[](){},~|;!?':#%^\\\`) != String.npos);
+ String.find_first_not_of(
+ ABCDEFGHIJKLMNOPQRSTUVWXYZ
+ abcdefghijklmnopqrstuvwxyz
+ 0123456789
+ $_./) != String.npos);
const char* quote = needQuote? \ : ;
// Print the string, quoted and escaped as necessary.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c635339b0039d677100f7212ed02d8f0dc3f492d
commit c635339b0039d677100f7212ed02d8f0dc3f492d
Author: Gregor Jasny gja...@googlemail.com
AuthorDate: Sat Aug 1 22:30:15 2015 +0200
Commit: Gregor Jasny gja...@googlemail.com
CommitDate: Sun Aug 2 00:16:31 2015 +0200
Xcode: quote more characters
diff --git a/Source/cmXCodeObject.cxx b/Source/cmXCodeObject.cxx
index ba6e395..4041d26 100644
--- a/Source/cmXCodeObject.cxx
+++ b/Source/cmXCodeObject.cxx
@@ -243,7 +243,7 @@ void cmXCodeObject::PrintString(std::ostream
os,std::string String)
bool needQuote =
(String.empty() ||
String.find(//) != String.npos ||
- String.find_first_of( +-*=@[](){},~) != String.npos);
+ String.find_first_of( +-*=@[](){},~|;!?':#%^\\\`) != String.npos);
const char* quote = needQuote? \ : ;
// Print the string, quoted and escaped as necessary.
---
Summary of changes:
Source/cmXCodeObject.cxx |6 +-
1 file changed, 5 insertions(+), 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.3.0-1902-gd5b5aac
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 d5b5aac6c174e169fcd12391011e3d2c22ef961e (commit)
via 59a722f73a98fcc6695d62dcc9069bfbcaadff46 (commit)
via 5b3c3d5e14c22ec7a96f5514bfff6d1b1e2232bc (commit)
via ea7051f5c47d4618279e084ddac1627a973e1140 (commit)
via fcc510ba32975dfc6257ac5998aeba58cda3088a (commit)
via e26f53a88b2fd16fc54513adfbb8eaab26dd102f (commit)
via 64aacb24b65e5496b4148437ed96363ae06e8200 (commit)
from c06c74f32f5318789bd72ddb41cec9759d6a9339 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d5b5aac6c174e169fcd12391011e3d2c22ef961e
commit d5b5aac6c174e169fcd12391011e3d2c22ef961e
Merge: c06c74f 59a722f
Author: Domen Vrankar domen.vran...@gmail.com
AuthorDate: Tue Aug 4 16:51:06 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Aug 4 16:51:06 2015 -0400
Merge topic 'cpack-rpm-documentation-fixes' into next
59a722f7 RunCMake/CPack dependencies tests
5b3c3d5e RunCMake/CPack bumped verify result cmake version
ea7051f5 RunCMake/CPack_DEB getPackageInfo helper function
fcc510ba RunCMake/CPack enable CXX
e26f53a8 CPack/RPM: missing PACKAGE_CONFLICTS documentation
64aacb24 CPack/RPM: undocumented variables
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=59a722f73a98fcc6695d62dcc9069bfbcaadff46
commit 59a722f73a98fcc6695d62dcc9069bfbcaadff46
Author: Domen Vrankar domen.vran...@gmail.com
AuthorDate: Wed Jul 29 23:39:11 2015 +0200
Commit: Domen Vrankar domen.vran...@gmail.com
CommitDate: Tue Aug 4 22:49:13 2015 +0200
RunCMake/CPack dependencies tests
Tests for RPM and DEB package test for
currently supported dependency features
(requires, provides, conflicts, ...)
diff --git a/Tests/RunCMake/CPack/DEB/DEPENDENCIES-ExpectedFiles.cmake
b/Tests/RunCMake/CPack/DEB/DEPENDENCIES-ExpectedFiles.cmake
new file mode 100644
index 000..577a560
--- /dev/null
+++ b/Tests/RunCMake/CPack/DEB/DEPENDENCIES-ExpectedFiles.cmake
@@ -0,0 +1,13 @@
+set(whitespaces_ [\t\n\r ]*)
+
+set(EXPECTED_FILES_COUNT 5)
+set(EXPECTED_FILE_1 dependencies*-applications.deb)
+set(EXPECTED_FILE_CONTENT_1 ^.*/usr/foo${whitespaces_}.*/usr/foo/test_prog$)
+set(EXPECTED_FILE_2 dependencies*-applications_auto.deb)
+set(EXPECTED_FILE_CONTENT_2
^.*/usr/foo_auto${whitespaces_}.*/usr/foo_auto/test_prog$)
+set(EXPECTED_FILE_3 dependencies*-headers.deb)
+set(EXPECTED_FILE_CONTENT_3
^.*/usr/bar${whitespaces_}.*/usr/bar/CMakeLists.txt$)
+set(EXPECTED_FILE_4 dependencies*-libs.deb)
+set(EXPECTED_FILE_CONTENT_4
^.*/usr/bas${whitespaces_}.*/usr/bas/libtest_lib.so$)
+set(EXPECTED_FILE_5 dependencies*-libs_auto.deb)
+set(EXPECTED_FILE_CONTENT_5
^.*/usr/bas_auto${whitespaces_}.*/usr/bas_auto/libtest_lib.so$)
diff --git a/Tests/RunCMake/CPack/DEB/DEPENDENCIES-VerifyResult.cmake
b/Tests/RunCMake/CPack/DEB/DEPENDENCIES-VerifyResult.cmake
new file mode 100644
index 000..44c862d
--- /dev/null
+++ b/Tests/RunCMake/CPack/DEB/DEPENDENCIES-VerifyResult.cmake
@@ -0,0 +1,15 @@
+function(checkDepends_ FILE REGEX)
+ set(whitespaces_ [\t\n\r ]*)
+
+ getPackageInfo(${FILE} FILE_INFO_)
+ if(NOT FILE_INFO_ MATCHES ${REGEX})
+message(FATAL_ERROR Unexpected dependencies in '${FILE}'; file info:
'${FILE_INFO_}')
+ endif()
+endfunction()
+
+checkDepends_(${FOUND_FILE_1}
.*Depends${whitespaces_}:${whitespaces_}depend-application,
depend-application-b.*)
+# use wildcard as we are using dependency auto detection
+checkDepends_(${FOUND_FILE_2}
.*Depends${whitespaces_}:${whitespaces_}.*depend-application,
depend-application-b.*)
+checkDepends_(${FOUND_FILE_3}
.*Depends${whitespaces_}:${whitespaces_}depend-headers.*)
+checkDepends_(${FOUND_FILE_4}
.*Depends${whitespaces_}:${whitespaces_}depend-default, depend-default-b.*)
+checkDepends_(${FOUND_FILE_5}
.*Depends${whitespaces_}:${whitespaces_}depend-default, depend-default-b.*)
diff --git a/Tests/RunCMake/CPack/DEB/DEPENDENCIES-specifics.cmake
b/Tests/RunCMake/CPack/DEB/DEPENDENCIES-specifics.cmake
new file mode 100644
index 000..9e09428
--- /dev/null
+++ b/Tests/RunCMake/CPack/DEB/DEPENDENCIES-specifics.cmake
@@ -0,0 +1,15 @@
+set(CPACK_PACKAGE_CONTACT someone)
+set(CPACK_DEB_COMPONENT_INSTALL ON)
+
+# false by default
+set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS FALSE)
+# FIXME can not be tested as libraries first have to be part of a package in
order
+# to determine their dependencies and we can not be certain if there will be
any
+set(CPACK_DEBIAN_APPLICATIONS_AUTO_PACKAGE_SHLIBDEPS TRUE)
+
+set(CPACK_DEBIAN_PACKAGE_DEPENDS depend-default,
