[Cmake-commits] CMake branch, master, updated. v3.12.0-rc3-175-gd73ad4e
Kitware Robot
kwrobot at kitware.com
Tue Jul 10 10:15:06 EDT 2018
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 d73ad4ed8b55cae3cd87bc06e7baefddce36944e (commit)
via c48129450864052160d061c6d7bd59f9044445a4 (commit)
via 5f7886c52b8f06c6429c66c102af9f4afe72896c (commit)
via eb2ee1dc7e82e7f89ccca024103bf64186a6d101 (commit)
via 3b2ea092ef42f52434c9618023d3a7216bb43c98 (commit)
via b771b2c3001e2137293de4197a8567e5cd9f6466 (commit)
via de5a4653d73aa601af9d08c91d4de2e09c430c1e (commit)
via 2f4075fa45a180dce701295dbabb131518652221 (commit)
from be69317b971dd381fe771701aa9ed944416e26c6 (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=d73ad4ed8b55cae3cd87bc06e7baefddce36944e
commit d73ad4ed8b55cae3cd87bc06e7baefddce36944e
Merge: c481294 eb2ee1d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 10 14:07:34 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Jul 10 10:07:39 2018 -0400
Merge topic 'skip_mfc_test'
eb2ee1dc7e Tests: skip MFC test when building cmake when no file association for vcproj
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2196
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c48129450864052160d061c6d7bd59f9044445a4
commit c48129450864052160d061c6d7bd59f9044445a4
Merge: 5f7886c de5a465
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 10 14:06:47 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Jul 10 10:06:53 2018 -0400
Merge topic 'uwp'
de5a4653d7 Add WindowsPhone and WindowsStore platform modules for Clang/GNU C/CXX
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2197
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5f7886c52b8f06c6429c66c102af9f4afe72896c
commit 5f7886c52b8f06c6429c66c102af9f4afe72896c
Merge: be69317 3b2ea09
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 10 14:06:00 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Jul 10 10:06:07 2018 -0400
Merge topic 'vs-deployment-files'
3b2ea092ef Help: Add documentation for DEPLOYMENT_ADDITIONAL_FILES
b771b2c300 VS: extended OutputDeploymentDebuggerTool for AdditionalFiles
2f4075fa45 VS: moved EscapeForXML function higher up and made static
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2184
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eb2ee1dc7e82e7f89ccca024103bf64186a6d101
commit eb2ee1dc7e82e7f89ccca024103bf64186a6d101
Author: Fred Baksik <frodak17 at gmail.com>
AuthorDate: Sat Jul 7 13:01:54 2018 -0400
Commit: Fred Baksik <frodak17 at gmail.com>
CommitDate: Mon Jul 9 11:29:54 2018 -0400
Tests: skip MFC test when building cmake when no file association for vcproj
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index b389a13..9200579 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1940,6 +1940,10 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
message(STATUS
".vcproj file association indicates VCExpress, avoiding MFC test")
set(CTEST_RUN_MFC OFF)
+ elseif( NOT ov )
+ message(STATUS
+ ".vcproj has no file association, avoiding MFC test")
+ set(CTEST_RUN_MFC OFF)
endif()
endif()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3b2ea092ef42f52434c9618023d3a7216bb43c98
commit 3b2ea092ef42f52434c9618023d3a7216bb43c98
Author: Frank Goyens <frank.goyens at delem.com>
AuthorDate: Mon Jul 2 10:35:26 2018 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 9 07:39:39 2018 -0400
Help: Add documentation for DEPLOYMENT_ADDITIONAL_FILES
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index 03a6a27..bebd591 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -173,6 +173,7 @@ Properties on Targets
/prop_tgt/DEBUG_POSTFIX
/prop_tgt/DEFINE_SYMBOL
/prop_tgt/DEPLOYMENT_REMOTE_DIRECTORY
+ /prop_tgt/DEPLOYMENT_ADDITIONAL_FILES
/prop_tgt/DOTNET_TARGET_FRAMEWORK_VERSION
/prop_tgt/EchoString
/prop_tgt/ENABLE_EXPORTS
diff --git a/Help/prop_tgt/DEPLOYMENT_ADDITIONAL_FILES.rst b/Help/prop_tgt/DEPLOYMENT_ADDITIONAL_FILES.rst
new file mode 100644
index 0000000..5e9c191
--- /dev/null
+++ b/Help/prop_tgt/DEPLOYMENT_ADDITIONAL_FILES.rst
@@ -0,0 +1,18 @@
+DEPLOYMENT_ADDITIONAL_FILES
+---------------------------
+
+Set the WinCE project ``AdditionalFiles`` in ``DeploymentTool`` in ``.vcproj``
+files generated by the :generator:`Visual Studio 9 2008` generator.
+This is useful when you want to debug on remote WinCE device.
+Specify additional files that will be copied to the device.
+For example:
+
+.. code-block:: cmake
+
+ set_property(TARGET ${TARGET} PROPERTY
+ DEPLOYMENT_ADDITIONAL_FILES "english.lng|local_folder|remote_folder|0"
+ "german.lng|local_folder|remote_folder|0")
+
+produces::
+
+ <DeploymentTool AdditionalFiles="english.lng|local_folder|remote_folder|0;german.lng|local_folder|remote_folder|0" ... />
diff --git a/Help/release/dev/vs-deployment-files.rst b/Help/release/dev/vs-deployment-files.rst
new file mode 100644
index 0000000..1590ed9
--- /dev/null
+++ b/Help/release/dev/vs-deployment-files.rst
@@ -0,0 +1,7 @@
+vs-deployment-files
+-------------------
+
+* The :prop_tgt:`DEPLOYMENT_ADDITIONAL_FILES` target property was
+ added to tell the :generator:`Visual Studio 9 2008` generator
+ to specify additional files for deployment to WinCE devices
+ for remote debugging.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b771b2c3001e2137293de4197a8567e5cd9f6466
commit b771b2c3001e2137293de4197a8567e5cd9f6466
Author: Frank Goyens <frank.goyens at delem.com>
AuthorDate: Fri Jun 29 15:41:41 2018 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 9 07:39:39 2018 -0400
VS: extended OutputDeploymentDebuggerTool for AdditionalFiles
The `OutputDeploymentDebuggerTool` function now also retrieves a target
property that is used for setting the `AdditionalFiles` attribute of
`DeploymentTool`.
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 2c1a95c..c90c5b8 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1245,30 +1245,44 @@ static std::string cmLocalVisualStudio7GeneratorEscapeForXML(
return ret;
}
+static std::string GetEscapedPropertyIfValueNotNULL(const char* propertyValue)
+{
+ return propertyValue == nullptr
+ ? std::string()
+ : cmLocalVisualStudio7GeneratorEscapeForXML(propertyValue);
+}
+
void cmLocalVisualStudio7Generator::OutputDeploymentDebuggerTool(
std::ostream& fout, std::string const& config, cmGeneratorTarget* target)
{
if (this->WindowsCEProject) {
- if (const char* dir = target->GetProperty("DEPLOYMENT_REMOTE_DIRECTORY")) {
- /* clang-format off */
- fout <<
- "\t\t\t<DeploymentTool\n"
- "\t\t\t\tForceDirty=\"-1\"\n"
- "\t\t\t\tRemoteDirectory=\"" << this->EscapeForXML(dir) << "\"\n"
- "\t\t\t\tRegisterOutput=\"0\"\n"
- "\t\t\t\tAdditionalFiles=\"\"/>\n"
- ;
- /* clang-format on */
+ const char* dir = target->GetProperty("DEPLOYMENT_REMOTE_DIRECTORY");
+ const char* additionalFiles =
+ target->GetProperty("DEPLOYMENT_ADDITIONAL_FILES");
+
+ if (dir == nullptr && additionalFiles == nullptr) {
+ return;
+ }
+
+ fout << "\t\t\t<DeploymentTool\n"
+ "\t\t\t\tForceDirty=\"-1\"\n"
+ "\t\t\t\tRemoteDirectory=\""
+ << GetEscapedPropertyIfValueNotNULL(dir)
+ << "\"\n"
+ "\t\t\t\tRegisterOutput=\"0\"\n"
+ "\t\t\t\tAdditionalFiles=\""
+ << GetEscapedPropertyIfValueNotNULL(additionalFiles) << "\"/>\n";
+
+ if (dir != nullptr) {
std::string const exe =
dir + std::string("\\") + target->GetFullName(config);
- /* clang-format off */
- fout <<
- "\t\t\t<DebuggerTool\n"
- "\t\t\t\tRemoteExecutable=\"" << this->EscapeForXML(exe) << "\"\n"
- "\t\t\t\tArguments=\"\"\n"
- "\t\t\t/>\n"
- ;
- /* clang-format on */
+
+ fout << "\t\t\t<DebuggerTool\n"
+ "\t\t\t\tRemoteExecutable=\""
+ << this->EscapeForXML(exe)
+ << "\"\n"
+ "\t\t\t\tArguments=\"\"\n"
+ "\t\t\t/>\n";
}
}
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=de5a4653d73aa601af9d08c91d4de2e09c430c1e
commit de5a4653d73aa601af9d08c91d4de2e09c430c1e
Author: Martin Storsjö <martin at martin.st>
AuthorDate: Sun Jul 1 23:16:00 2018 +0300
Commit: Martin Storsjö <martin at martin.st>
CommitDate: Sun Jul 8 00:06:37 2018 +0300
Add WindowsPhone and WindowsStore platform modules for Clang/GNU C/CXX
Just like the existing WindowsPhone and WindowsStore platform modules
for MSVC, just include the corresponding Windows platform modules.
MinGW tools (both with GCC and Clang) can be used for building for
Windows Store, even though it isn't a very common or simple setup.
diff --git a/Modules/Platform/WindowsPhone-Clang-C.cmake b/Modules/Platform/WindowsPhone-Clang-C.cmake
new file mode 100644
index 0000000..6e38572
--- /dev/null
+++ b/Modules/Platform/WindowsPhone-Clang-C.cmake
@@ -0,0 +1 @@
+include(Platform/Windows-Clang-C)
diff --git a/Modules/Platform/WindowsPhone-Clang-CXX.cmake b/Modules/Platform/WindowsPhone-Clang-CXX.cmake
new file mode 100644
index 0000000..bf47978
--- /dev/null
+++ b/Modules/Platform/WindowsPhone-Clang-CXX.cmake
@@ -0,0 +1 @@
+include(Platform/Windows-Clang-CXX)
diff --git a/Modules/Platform/WindowsPhone-GNU-C.cmake b/Modules/Platform/WindowsPhone-GNU-C.cmake
new file mode 100644
index 0000000..ff6acd5
--- /dev/null
+++ b/Modules/Platform/WindowsPhone-GNU-C.cmake
@@ -0,0 +1 @@
+include(Platform/Windows-GNU-C)
diff --git a/Modules/Platform/WindowsPhone-GNU-CXX.cmake b/Modules/Platform/WindowsPhone-GNU-CXX.cmake
new file mode 100644
index 0000000..6adab6a
--- /dev/null
+++ b/Modules/Platform/WindowsPhone-GNU-CXX.cmake
@@ -0,0 +1 @@
+include(Platform/Windows-GNU-CXX)
diff --git a/Modules/Platform/WindowsStore-Clang-C.cmake b/Modules/Platform/WindowsStore-Clang-C.cmake
new file mode 100644
index 0000000..6e38572
--- /dev/null
+++ b/Modules/Platform/WindowsStore-Clang-C.cmake
@@ -0,0 +1 @@
+include(Platform/Windows-Clang-C)
diff --git a/Modules/Platform/WindowsStore-Clang-CXX.cmake b/Modules/Platform/WindowsStore-Clang-CXX.cmake
new file mode 100644
index 0000000..bf47978
--- /dev/null
+++ b/Modules/Platform/WindowsStore-Clang-CXX.cmake
@@ -0,0 +1 @@
+include(Platform/Windows-Clang-CXX)
diff --git a/Modules/Platform/WindowsStore-GNU-C.cmake b/Modules/Platform/WindowsStore-GNU-C.cmake
new file mode 100644
index 0000000..ff6acd5
--- /dev/null
+++ b/Modules/Platform/WindowsStore-GNU-C.cmake
@@ -0,0 +1 @@
+include(Platform/Windows-GNU-C)
diff --git a/Modules/Platform/WindowsStore-GNU-CXX.cmake b/Modules/Platform/WindowsStore-GNU-CXX.cmake
new file mode 100644
index 0000000..6adab6a
--- /dev/null
+++ b/Modules/Platform/WindowsStore-GNU-CXX.cmake
@@ -0,0 +1 @@
+include(Platform/Windows-GNU-CXX)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2f4075fa45a180dce701295dbabb131518652221
commit 2f4075fa45a180dce701295dbabb131518652221
Author: Frank Goyens <frank.goyens at delem.com>
AuthorDate: Fri Jun 29 15:39:52 2018 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Jul 6 11:30:23 2018 -0400
VS: moved EscapeForXML function higher up and made static
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 4b0b66d..2c1a95c 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1233,6 +1233,18 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(
}
}
+static std::string cmLocalVisualStudio7GeneratorEscapeForXML(
+ const std::string& s)
+{
+ std::string ret = s;
+ cmSystemTools::ReplaceString(ret, "&", "&");
+ cmSystemTools::ReplaceString(ret, "\"", """);
+ cmSystemTools::ReplaceString(ret, "<", "<");
+ cmSystemTools::ReplaceString(ret, ">", ">");
+ cmSystemTools::ReplaceString(ret, "\n", "
");
+ return ret;
+}
+
void cmLocalVisualStudio7Generator::OutputDeploymentDebuggerTool(
std::ostream& fout, std::string const& config, cmGeneratorTarget* target)
{
@@ -2056,17 +2068,6 @@ void cmLocalVisualStudio7Generator::WriteVCProjFooter(
<< "</VisualStudioProject>\n";
}
-std::string cmLocalVisualStudio7GeneratorEscapeForXML(const std::string& s)
-{
- std::string ret = s;
- cmSystemTools::ReplaceString(ret, "&", "&");
- cmSystemTools::ReplaceString(ret, "\"", """);
- cmSystemTools::ReplaceString(ret, "<", "<");
- cmSystemTools::ReplaceString(ret, ">", ">");
- cmSystemTools::ReplaceString(ret, "\n", "
");
- return ret;
-}
-
std::string cmLocalVisualStudio7Generator::EscapeForXML(const std::string& s)
{
return cmLocalVisualStudio7GeneratorEscapeForXML(s);
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-properties.7.rst | 1 +
Help/prop_tgt/DEPLOYMENT_ADDITIONAL_FILES.rst | 18 +++++++
Help/release/dev/vs-deployment-files.rst | 7 +++
Modules/Platform/WindowsPhone-Clang-C.cmake | 1 +
Modules/Platform/WindowsPhone-Clang-CXX.cmake | 1 +
Modules/Platform/WindowsPhone-GNU-C.cmake | 1 +
Modules/Platform/WindowsPhone-GNU-CXX.cmake | 1 +
Modules/Platform/WindowsStore-Clang-C.cmake | 1 +
Modules/Platform/WindowsStore-Clang-CXX.cmake | 1 +
Modules/Platform/WindowsStore-GNU-C.cmake | 1 +
Modules/Platform/WindowsStore-GNU-CXX.cmake | 1 +
Source/cmLocalVisualStudio7Generator.cxx | 73 ++++++++++++++++-----------
Tests/CMakeLists.txt | 4 ++
13 files changed, 82 insertions(+), 29 deletions(-)
create mode 100644 Help/prop_tgt/DEPLOYMENT_ADDITIONAL_FILES.rst
create mode 100644 Help/release/dev/vs-deployment-files.rst
create mode 100644 Modules/Platform/WindowsPhone-Clang-C.cmake
create mode 100644 Modules/Platform/WindowsPhone-Clang-CXX.cmake
create mode 100644 Modules/Platform/WindowsPhone-GNU-C.cmake
create mode 100644 Modules/Platform/WindowsPhone-GNU-CXX.cmake
create mode 100644 Modules/Platform/WindowsStore-Clang-C.cmake
create mode 100644 Modules/Platform/WindowsStore-Clang-CXX.cmake
create mode 100644 Modules/Platform/WindowsStore-GNU-C.cmake
create mode 100644 Modules/Platform/WindowsStore-GNU-CXX.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list