[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-1117-g677d66d
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 677d66d06472560a5c9dedfec73e093ee40db2c6 (commit)
via 636f0c1d4fa3f003fff406b27306cd6883bcec75 (commit)
via c90633df9eacb3063669ac0aad9506cea1885582 (commit)
from 6fe28452898c3fea0bf021cacfe0885686e517dd (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=677d66d06472560a5c9dedfec73e093ee40db2c6
commit 677d66d06472560a5c9dedfec73e093ee40db2c6
Merge: 6fe2845 636f0c1
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Fri Dec 5 04:29:03 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Dec 5 04:29:03 2014 -0500
Merge topic 'ExternalProject_TEST_EXCLUDE_FROM_MAIN' into next
636f0c1d ExternalProject: Add TEST_EXCLUDE_FROM_MAIN option
c90633df CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=636f0c1d4fa3f003fff406b27306cd6883bcec75
commit 636f0c1d4fa3f003fff406b27306cd6883bcec75
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Sun Nov 30 22:28:43 2014 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Fri Dec 5 10:24:16 2014 +0100
ExternalProject: Add TEST_EXCLUDE_FROM_MAIN option
If this option is enabled, the test step is created with the
EXCLUDE_FROM_MAIN option, and if TEST_BEFORE_INSTALL is enabled, the
install step does not depend on the test step.
This means that the test step is never executed, unless the test target
is explicitly created by calling ExternalProject_Add_StepTarget, or by
passing it with the STEP_TARGETS option, or with the EP_STEP_TARGETS
directory property.
diff --git a/Help/release/dev/ExternalProject_TEST_EXCLUDE_FROM_MAIN.rst
b/Help/release/dev/ExternalProject_TEST_EXCLUDE_FROM_MAIN.rst
new file mode 100644
index 000..dfbf108
--- /dev/null
+++ b/Help/release/dev/ExternalProject_TEST_EXCLUDE_FROM_MAIN.rst
@@ -0,0 +1,6 @@
+ExternalProject_TEST_EXCLUDE_FROM_MAIN
+--
+
+* The :module:`ExternalProject` module :command:`ExternalProject_Add`
+ command learned a ``TEST_EXCLUDE_FROM_MAIN`` option to exclude tests
+ from the main build.
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index e5616b1..7e4cc37 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -149,6 +149,8 @@ Create custom targets to build projects in external trees
Add test step executed before install step
``TEST_AFTER_INSTALL 1``
Add test step executed after install step
+ ``TEST_EXCLUDE_FROM_MAIN 1``
+Main target does not depend on the test step
``TEST_COMMAND cmd...``
Command to drive test
@@ -2193,12 +2195,13 @@ function(_ep_add_test_command name)
get_property(before TARGET ${name} PROPERTY _EP_TEST_BEFORE_INSTALL)
get_property(after TARGET ${name} PROPERTY _EP_TEST_AFTER_INSTALL)
+ get_property(exclude TARGET ${name} PROPERTY _EP_TEST_EXCLUDE_FROM_MAIN)
get_property(cmd_set TARGET ${name} PROPERTY _EP_TEST_COMMAND SET)
# Only actually add the test step if one of the test related properties is
# explicitly set. (i.e. the test step is omitted unless requested...)
#
- if(cmd_set OR before OR after)
+ if(cmd_set OR before OR after OR exclude)
if(cmd_set)
get_property(cmd TARGET ${name} PROPERTY _EP_TEST_COMMAND)
else()
@@ -2206,9 +2209,21 @@ function(_ep_add_test_command name)
endif()
if(before)
- set(dep_args DEPENDEES build DEPENDERS install)
+ set(dependees_args DEPENDEES build)
else()
- set(dep_args DEPENDEES install)
+ set(dependees_args DEPENDEES install)
+endif()
+
+if(exclude)
+ set(dependers_args )
+ set(exclude_args EXCLUDE_FROM_MAIN 1)
+else()
+ if(before)
+set(dependers_args DEPENDERS install)
+ else()
+set(dependers_args )
+ endif()
+ set(exclude_args )
endif()
get_property(log TARGET ${name} PROPERTY _EP_LOG_TEST)
@@ -2221,7 +2236,9 @@ function(_ep_add_test_command name)
ExternalProject_Add_Step(${name} test
COMMAND ${cmd}
WORKING_DIRECTORY ${binary_dir}
- ${dep_args}
+ ${dependees_args}
+ ${dependers_args}
+ ${exclude_args}
${log}
)
endif()
diff --git a/Tests/ExternalProjectLocal/CMakeLists.txt
b/Tests/ExternalProjectLocal/CMakeLists.txt
index cbbb555..9476ab4 100644
--- a/Tests/ExternalProjectLocal/CMakeLists.txt
+++ b/Tests/ExternalProjectLocal/CMakeLists.txt
@@ -71,6 +71,31 @@ if(can_build_tutorial_step5)
LOG_TEST
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-1124-gd13e65b
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 d13e65b3db32a6060b833e96024a1526998b63ea (commit)
via 65ea5eb721d820551653bf6471e83ed5f4a5ba13 (commit)
via 644b4688d71cc52f8499d6103495de0909319557 (commit)
via 8a4c6d2d2e66d210e5c2d59c86b3f1bff2582867 (commit)
from 5e9dfe5a8dfb20bea7f219edb7b740b6b9ee6864 (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=d13e65b3db32a6060b833e96024a1526998b63ea
commit d13e65b3db32a6060b833e96024a1526998b63ea
Merge: 5e9dfe5 65ea5eb
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Dec 5 10:34:14 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Dec 5 10:34:14 2014 -0500
Merge topic 'custom-command-multiple-outputs' into next
65ea5eb7 Tests: Cover rebuild with multiple custom command outputs (#15116)
644b4688 Makefile: Fix rebuild with multiple custom command outputs (#15116)
8a4c6d2d Xcode: Fix rebuild with multiple custom command outputs (#15116)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=65ea5eb721d820551653bf6471e83ed5f4a5ba13
commit 65ea5eb721d820551653bf6471e83ed5f4a5ba13
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Dec 5 09:56:26 2014 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Dec 5 09:56:26 2014 -0500
Tests: Cover rebuild with multiple custom command outputs (#15116)
Extend the BuildDepends test with a case covering multiple custom
command outputs with the second one consumed by another rule. With the
old multiple output pair infrastructure used in the Makefile and Xcode
generators this did not work. Now that it is fixed, test the case
explicitly.
diff --git a/Tests/BuildDepends/CMakeLists.txt
b/Tests/BuildDepends/CMakeLists.txt
index 6209bb8..78e9e17 100644
--- a/Tests/BuildDepends/CMakeLists.txt
+++ b/Tests/BuildDepends/CMakeLists.txt
@@ -65,6 +65,7 @@ file(WRITE
${BuildDepends_BINARY_DIR}/Project/link_depends_no_shared_exe.h
set(link_depends_no_shared_check_txt
${BuildDepends_BINARY_DIR}/Project/link_depends_no_shared_check.txt)
file(WRITE ${BuildDepends_BINARY_DIR}/Project/external.in external
original\n)
+file(WRITE ${BuildDepends_BINARY_DIR}/Project/multi1-in.txt multi1-in
original\n)
help_xcode_depends()
@@ -177,6 +178,19 @@ else()
external.out is missing)
endif()
+if(EXISTS ${BuildDepends_BINARY_DIR}/Project/multi1-out2-copy.txt)
+ file(STRINGS ${BuildDepends_BINARY_DIR}/Project/multi1-out2-copy.txt
multi1_out)
+ if(${multi1_out} STREQUAL multi1-in original)
+message(STATUS multi1-out2-copy.txt contains '${multi1_out}')
+ else()
+message(SEND_ERROR Project did not initially build properly:
+ multi1-out2-copy.txt contains '${multi1_out}')
+ endif()
+else()
+ message(SEND_ERROR Project did not initially build properly:
+multi1-out2-copy.txt is missing)
+endif()
+
message(Waiting 3 seconds...)
execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 3)
@@ -202,6 +216,7 @@ if(TEST_LINK_DEPENDS)
endif()
file(WRITE ${BuildDepends_BINARY_DIR}/Project/external.in external changed\n)
+file(WRITE ${BuildDepends_BINARY_DIR}/Project/multi1-in.txt multi1-in
changed\n)
help_xcode_depends()
@@ -319,3 +334,16 @@ else()
message(SEND_ERROR Project did not rebuild properly:
external.out is missing)
endif()
+
+if(EXISTS ${BuildDepends_BINARY_DIR}/Project/multi1-out2-copy.txt)
+ file(STRINGS ${BuildDepends_BINARY_DIR}/Project/multi1-out2-copy.txt
multi1_out)
+ if(${multi1_out} STREQUAL multi1-in changed)
+message(STATUS multi1-out2-copy.txt contains '${multi1_out}')
+ else()
+message(SEND_ERROR Project did not rebuild properly:
+ multi1-out2-copy.txt contains '${multi1_out}')
+ endif()
+else()
+ message(SEND_ERROR Project did not rebuild properly:
+multi1-out2-copy.txt is missing)
+endif()
diff --git a/Tests/BuildDepends/Project/CMakeLists.txt
b/Tests/BuildDepends/Project/CMakeLists.txt
index 9ee4a43..cb9fbf8 100644
--- a/Tests/BuildDepends/Project/CMakeLists.txt
+++ b/Tests/BuildDepends/Project/CMakeLists.txt
@@ -151,3 +151,16 @@ ExternalProject_Add(ExternalBuild
-Dexternal_out=${CMAKE_CURRENT_BINARY_DIR}/external.out
INSTALL_COMMAND
)
+
+add_custom_command(
+ OUTPUT multi1-out1.txt multi1-out2.txt
+ COMMAND ${CMAKE_COMMAND} -E copy multi1-in.txt multi1-out1.txt
+ COMMAND ${CMAKE_COMMAND} -E copy multi1-in.txt multi1-out2.txt
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/multi1-in.txt
+ )
+add_custom_command(
+ OUTPUT multi1-out2-copy.txt
+ COMMAND ${CMAKE_COMMAND} -E copy multi1-out2.txt multi1-out2-copy.txt
+
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-1126-gf3f7acf
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 f3f7acf67d013c432a610bea29d7d1b3b80a1150 (commit) via 356f7cf4457271ee85a71face453ea9579f05da3 (commit) from d13e65b3db32a6060b833e96024a1526998b63ea (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=f3f7acf67d013c432a610bea29d7d1b3b80a1150 commit f3f7acf67d013c432a610bea29d7d1b3b80a1150 Merge: d13e65b 356f7cf Author: Brad King brad.k...@kitware.com AuthorDate: Fri Dec 5 10:39:25 2014 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Fri Dec 5 10:39:25 2014 -0500 Merge branch 'master' into next --- Summary of changes: 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.1.0-rc2-1130-gb2dde04
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 b2dde0459e93b316d1c9700a466b9fb78c0f1c4f (commit)
via 97841dad2ba5a79acb0b22db9a01ae45f7b2e80b (commit)
from fe1b22fc00e60e37e88eacf31c369018f3eeabe9 (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=b2dde0459e93b316d1c9700a466b9fb78c0f1c4f
commit b2dde0459e93b316d1c9700a466b9fb78c0f1c4f
Merge: fe1b22f 97841da
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Dec 5 13:01:46 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Dec 5 13:01:46 2014 -0500
Merge topic 'file-LOCK-timeout-type' into next
97841dad file: Use 'long' to represent the parsed LOCK TIMEOUT value
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=97841dad2ba5a79acb0b22db9a01ae45f7b2e80b
commit 97841dad2ba5a79acb0b22db9a01ae45f7b2e80b
Author: Ruslan Baratov ruslan_bara...@yahoo.com
AuthorDate: Fri Dec 5 17:18:11 2014 +0300
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Dec 5 12:59:37 2014 -0500
file: Use 'long' to represent the parsed LOCK TIMEOUT value
Convert the StringToInt helper into a StringToLong helper with a 'long'
result type. This will make the helper more useful to other callers
that want to use strtol.
While at it, also check errno after calling strtol in case the
conversion fails with a range error.
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index a6eb8c4..3c2dfa5 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -3521,7 +3521,7 @@ bool cmFileCommand::HandleLockCommand(
};
Guard guard = GUARD_PROCESS;
std::string resultVariable;
- unsigned timeout = static_castunsigned(-1);
+ unsigned long timeout = static_castunsigned long(-1);
// Parse arguments
if(args.size() 2)
@@ -3597,15 +3597,16 @@ bool cmFileCommand::HandleLockCommand(
expected timeout value after TIMEOUT);
return false;
}
- int scanned;
- if(!cmSystemTools::StringToInt(args[i].c_str(), scanned) || scanned 0)
+ long scanned;
+ if(!cmSystemTools::StringToLong(args[i].c_str(), scanned)
+ || scanned 0)
{
cmOStringStream e;
e TIMEOUT value \ args[i] \ is not an unsigned integer.;
this-Makefile-IssueMessage(cmake::FATAL_ERROR, e.str());
return false;
}
- timeout = static_castunsigned(scanned);
+ timeout = static_castunsigned long(scanned);
}
else
{
diff --git a/Source/cmFileLock.cxx b/Source/cmFileLock.cxx
index 5f75637..e6aa5f4 100644
--- a/Source/cmFileLock.cxx
+++ b/Source/cmFileLock.cxx
@@ -28,7 +28,7 @@ cmFileLock::~cmFileLock()
}
cmFileLockResult cmFileLock::Lock(
-const std::string filename, unsigned timeout)
+const std::string filename, unsigned long timeout)
{
if (filename.empty())
{
@@ -48,7 +48,7 @@ cmFileLockResult cmFileLock::Lock(
cmFileLockResult result = this-OpenFile();
if (result.IsOk())
{
-if (timeout == static_castunsigned(-1))
+if (timeout == static_castunsigned long(-1))
{
result = this-LockWithoutTimeout();
}
diff --git a/Source/cmFileLock.h b/Source/cmFileLock.h
index 4d922a0..dd959a7 100644
--- a/Source/cmFileLock.h
+++ b/Source/cmFileLock.h
@@ -37,7 +37,7 @@ class cmFileLock
* @brief Lock the file.
* @param timeoutSec Lock timeout. If -1 try until success or fatal error.
*/
- cmFileLockResult Lock(const std::string filename, unsigned timeoutSec);
+ cmFileLockResult Lock(const std::string filename, unsigned long timeoutSec);
/**
* @brief Unlock the file.
@@ -57,7 +57,7 @@ class cmFileLock
cmFileLockResult OpenFile();
cmFileLockResult LockWithoutTimeout();
- cmFileLockResult LockWithTimeout(unsigned timeoutSec);
+ cmFileLockResult LockWithTimeout(unsigned long timeoutSec);
#if defined(_WIN32)
typedef HANDLE FileId;
diff --git a/Source/cmFileLockPool.cxx b/Source/cmFileLockPool.cxx
index e84e71a..551a75a 100644
--- a/Source/cmFileLockPool.cxx
+++ b/Source/cmFileLockPool.cxx
@@ -60,7 +60,7 @@ void cmFileLockPool::PopFileScope()
}
cmFileLockResult cmFileLockPool::LockFunctionScope(
-const std::string filename, unsigned timeoutSec)
+const std::string filename, unsigned long timeoutSec)
{
if (this-IsAlreadyLocked(filename))
{
@@ -74,7 +74,7 @@ cmFileLockResult cmFileLockPool::LockFunctionScope(
}
cmFileLockResult cmFileLockPool::LockFileScope(
-const std::string filename, unsigned timeoutSec)
+const std::string filename, unsigned long timeoutSec)
{
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-1132-gc00ead9
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 c00ead9f5516d9d84da5bf365bf9d8345e1d347b (commit) via fe21580b84d06c263bbcb6d90089b9e6bb91b25b (commit) from b2dde0459e93b316d1c9700a466b9fb78c0f1c4f (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=c00ead9f5516d9d84da5bf365bf9d8345e1d347b commit c00ead9f5516d9d84da5bf365bf9d8345e1d347b Merge: b2dde04 fe21580 Author: Brad King brad.k...@kitware.com AuthorDate: Fri Dec 5 13:31:14 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Dec 5 13:31:14 2014 -0500 Merge topic 'doc-file-GENERATE-order' into next fe21580b Help: Document file(GENERATE) signature option order http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fe21580b84d06c263bbcb6d90089b9e6bb91b25b commit fe21580b84d06c263bbcb6d90089b9e6bb91b25b Author: Brad King brad.k...@kitware.com AuthorDate: Fri Dec 5 13:28:24 2014 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Fri Dec 5 13:28:24 2014 -0500 Help: Document file(GENERATE) signature option order In commit v3.1.0-rc1~484^2 (Help: Format and revise file() command documentation, 2014-05-23) the signature of file(GENERATE) was accidentally simplified too much and dropped specification of the required argument ordering. Restore the signature to make the order clear. diff --git a/Help/command/file.rst b/Help/command/file.rst index dbc4149..5d3c4a9 100644 --- a/Help/command/file.rst +++ b/Help/command/file.rst @@ -247,7 +247,9 @@ the ``format`` and ``UTC`` options. :: - file(GENERATE options...) + file(GENERATE OUTPUT output-file + INPUT input-file|CONTENT content + [CONDITION expression]) Generate an output file for each build configuration supported by the current :manual:`CMake Generator cmake-generators(7)`. Evaluate --- Summary of changes: Help/command/file.rst |4 +++- 1 file changed, 3 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, master, updated. v3.1.0-rc2-503-g03db9a0
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 03db9a061aa62eb2b373010a6a38d5707749a6d7 (commit) via fe21580b84d06c263bbcb6d90089b9e6bb91b25b (commit) from 356f7cf4457271ee85a71face453ea9579f05da3 (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=03db9a061aa62eb2b373010a6a38d5707749a6d7 commit 03db9a061aa62eb2b373010a6a38d5707749a6d7 Merge: 356f7cf fe21580 Author: Brad King brad.k...@kitware.com AuthorDate: Fri Dec 5 14:01:04 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Dec 5 14:01:04 2014 -0500 Merge topic 'doc-file-GENERATE-order' fe21580b Help: Document file(GENERATE) signature option order --- Summary of changes: Help/command/file.rst |4 +++- 1 file changed, 3 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.1.0-rc2-1134-g3042e27
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 3042e27a969b11b13a9e742e0b8d7ec662e0e350 (commit) via 03db9a061aa62eb2b373010a6a38d5707749a6d7 (commit) from c00ead9f5516d9d84da5bf365bf9d8345e1d347b (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=3042e27a969b11b13a9e742e0b8d7ec662e0e350 commit 3042e27a969b11b13a9e742e0b8d7ec662e0e350 Merge: c00ead9 03db9a0 Author: Brad King brad.k...@kitware.com AuthorDate: Fri Dec 5 14:01:21 2014 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Fri Dec 5 14:01:21 2014 -0500 Merge branch 'master' into next --- Summary of changes: 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.1.0-rc2-505-gfad59f2
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 fad59f2dd12b72ec1b23b08a8bff7f0b296bb4b1 (commit)
via 27141eede739fb4376a6fe2cec1b1171841bf7fb (commit)
from 03db9a061aa62eb2b373010a6a38d5707749a6d7 (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=fad59f2dd12b72ec1b23b08a8bff7f0b296bb4b1
commit fad59f2dd12b72ec1b23b08a8bff7f0b296bb4b1
Merge: 03db9a0 27141ee
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Dec 5 14:02:11 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Dec 5 14:02:11 2014 -0500
Merge topic 'xerces-rename'
27141eed Modules: Rename FindXerces to FindXercesC
---
Summary of changes:
Help/manual/cmake-modules.7.rst |2 +-
Help/module/FindXerces.rst |1 -
Help/module/FindXercesC.rst |1 +
Help/release/3.1.0.rst |2 +
Modules/{FindXerces.cmake = FindXercesC.cmake} | 66 +++
5 files changed, 37 insertions(+), 35 deletions(-)
delete mode 100644 Help/module/FindXerces.rst
create mode 100644 Help/module/FindXercesC.rst
rename Modules/{FindXerces.cmake = FindXercesC.cmake} (55%)
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.1.0-rc2-1136-gf0fcb0b
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 f0fcb0b3883272097f98c16d3ae33f13511b5864 (commit) via fad59f2dd12b72ec1b23b08a8bff7f0b296bb4b1 (commit) from 3042e27a969b11b13a9e742e0b8d7ec662e0e350 (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=f0fcb0b3883272097f98c16d3ae33f13511b5864 commit f0fcb0b3883272097f98c16d3ae33f13511b5864 Merge: 3042e27 fad59f2 Author: Brad King brad.k...@kitware.com AuthorDate: Fri Dec 5 14:02:20 2014 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Fri Dec 5 14:02:20 2014 -0500 Merge branch 'master' into next --- Summary of changes: 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.1.0-rc2-508-gce28da6
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 ce28da6c64aba359b4399bca56ec60707a3d6073 (commit) via eff4081bfbc7285ceeb5d6ec32a4f8682066cef6 (commit) via c2d371034e01ce7472cafb177f272030c1242513 (commit) from fad59f2dd12b72ec1b23b08a8bff7f0b296bb4b1 (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 - --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.1.0-rc2-82-geff4081
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, release has been updated via eff4081bfbc7285ceeb5d6ec32a4f8682066cef6 (commit) via fe21580b84d06c263bbcb6d90089b9e6bb91b25b (commit) via c2d371034e01ce7472cafb177f272030c1242513 (commit) via 607b39dc1192a9e0f7eae66f9979c399e5126337 (commit) from 1c104c019a23392563befb3564dd5c679cc2c585 (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 - --- Summary of changes: Help/command/file.rst |4 +++- Utilities/Sphinx/cmake.py | 12 ++-- 2 files changed, 13 insertions(+), 3 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.1.0-rc2-1140-g8677735
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 86777356c5ebfc43fbbf5aabceaeea02d6b3f84e (commit) via ce28da6c64aba359b4399bca56ec60707a3d6073 (commit) via eff4081bfbc7285ceeb5d6ec32a4f8682066cef6 (commit) via c2d371034e01ce7472cafb177f272030c1242513 (commit) from f0fcb0b3883272097f98c16d3ae33f13511b5864 (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=86777356c5ebfc43fbbf5aabceaeea02d6b3f84e commit 86777356c5ebfc43fbbf5aabceaeea02d6b3f84e Merge: f0fcb0b ce28da6 Author: Brad King brad.k...@kitware.com AuthorDate: Fri Dec 5 14:03:33 2014 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Fri Dec 5 14:03:33 2014 -0500 Merge branch 'master' into next --- Summary of changes: 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.1.0-rc2-1142-gad137b5
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 ad137b5af4f40f7c07df7da67684082c5e4a5012 (commit)
via de022e8908cc5b3a6e0f179a81482fad4cfb6072 (commit)
from 86777356c5ebfc43fbbf5aabceaeea02d6b3f84e (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=ad137b5af4f40f7c07df7da67684082c5e4a5012
commit ad137b5af4f40f7c07df7da67684082c5e4a5012
Merge: 8677735 de022e8
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Dec 5 14:09:05 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Dec 5 14:09:05 2014 -0500
Merge topic 'optional-latest-language-dialects' into next
de022e89 Add options to build CMake without latest language dialects
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=de022e8908cc5b3a6e0f179a81482fad4cfb6072
commit de022e8908cc5b3a6e0f179a81482fad4cfb6072
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Dec 5 14:06:43 2014 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Dec 5 14:07:59 2014 -0500
Add options to build CMake without latest language dialects
Set CMAKE_C_STANDARD and CMAKE_CXX_STANDARD only if they are not
already defined. This will allow users to add the settings with
different values to their local cache (e.g. on the command line).
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad3bb97..1812b27 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,8 +37,12 @@ if(${CMake_SOURCE_DIR} STREQUAL ${CMAKE_SOURCE_DIR})
endif()
# Use most-recent available language dialects with GNU and Clang
-set(CMAKE_C_STANDARD 11)
-set(CMAKE_CXX_STANDARD 14)
+if(NOT DEFINED CMAKE_C_STANDARD)
+ set(CMAKE_C_STANDARD 11)
+endif()
+if(NOT DEFINED CMAKE_CXX_STANDARD)
+ set(CMAKE_CXX_STANDARD 14)
+endif()
# option to set the internal encoding of CMake to UTF-8
option(CMAKE_ENCODING_UTF8 Use UTF-8 encoding internally (experimental). OFF)
---
Summary of changes:
CMakeLists.txt |8 ++--
1 file changed, 6 insertions(+), 2 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.1.0-rc2-509-gbec5b3d
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 bec5b3df0148bc8ae9c9c777367386fb1a38ad04 (commit) from ce28da6c64aba359b4399bca56ec60707a3d6073 (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=bec5b3df0148bc8ae9c9c777367386fb1a38ad04 commit bec5b3df0148bc8ae9c9c777367386fb1a38ad04 Author: Kitware Robot kwro...@kitware.com AuthorDate: Sat Dec 6 00:01:15 2014 -0500 Commit: Kitware Robot kwro...@kitware.com CommitDate: Sat Dec 6 00:01:15 2014 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 3048b88..abaa2d0 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 1) -set(CMake_VERSION_PATCH 20141205) +set(CMake_VERSION_PATCH 20141206) #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
