[Cmake-commits] CMake branch, next, updated. v3.0.1-4983-gf13f913
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 f13f913f7cbde7616e2a2fc2209e087967ecba58 (commit)
via f1e9fa3cb6e2ac3f1cd94946a2a71e60950406f8 (commit)
via 22a89b7ab59e4e44c06788578b22905c8753cdb7 (commit)
from 5f774ccb6860d8e48a0e44813c7348c9806ba324 (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=f13f913f7cbde7616e2a2fc2209e087967ecba58
commit f13f913f7cbde7616e2a2fc2209e087967ecba58
Merge: 5f774cc f1e9fa3
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Aug 20 10:04:50 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Aug 20 10:04:50 2014 -0400
Merge topic 'vs-windows-apps' into next
f1e9fa3c VS: Place missing artifacts in per-target intermediate directory
22a89b7a VS: Generate default AppxManifest in a per-target directory
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f1e9fa3cb6e2ac3f1cd94946a2a71e60950406f8
commit f1e9fa3cb6e2ac3f1cd94946a2a71e60950406f8
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Aug 20 09:12:07 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Aug 20 09:57:09 2014 -0400
VS: Place missing artifacts in per-target intermediate directory
Also revise missing file generation code to simplify layout and
encode characters for XML correctly.
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx
b/Source/cmVisualStudio10TargetGenerator.cxx
index 0a538d0..a1dd7ab 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -161,6 +161,9 @@ cmVisualStudio10TargetGenerator(cmTarget* target,
this-MSTools = true;
this-BuildFileStream = 0;
this-IsMissingFiles = false;
+ this-DefaultArtifactDir =
+this-Makefile-GetStartOutputDirectory() + std::string(/) +
+this-LocalGenerator-GetTargetDirectory(*this-Target);
}
cmVisualStudio10TargetGenerator::~cmVisualStudio10TargetGenerator()
@@ -2327,9 +2330,12 @@ void
cmVisualStudio10TargetGenerator::WriteWinRTPackageCertificateKeyFile()
this-GlobalGenerator-GetSystemVersion() == 8.0))
{
// Move the manifest to a project directory to avoid clashes
+ std::string artifactDir =
+this-LocalGenerator-GetTargetDirectory(*this-Target);
+ this-ConvertToWindowsSlash(artifactDir);
this-WriteString(PropertyGroup\n, 1);
this-WriteString(AppxPackageArtifactsDir, 2);
- (*this-BuildFileStream) this-Target-GetName()
+ (*this-BuildFileStream) cmVS10EscapeXML(artifactDir)
\\/AppxPackageArtifactsDir\n;
this-WriteString(ProjectPriFullPath
$(TargetDir)resources.pri/ProjectPriFullPath, 2);
@@ -2338,11 +2344,9 @@ void
cmVisualStudio10TargetGenerator::WriteWinRTPackageCertificateKeyFile()
// aren't targeting WP8.0, add a default certificate
if(pfxFile.empty())
{
-std::string baseFolder = this-Makefile-GetStartOutputDirectory() +
- std::string(/) + this-Target-GetName();
std::string templateFolder = cmSystemTools::GetCMakeRoot() +
/Templates/Windows;
-pfxFile = baseFolder + /Windows_TemporaryKey.pfx;
+pfxFile = this-DefaultArtifactDir + /Windows_TemporaryKey.pfx;
cmSystemTools::CopyAFile(templateFolder + /Windows_TemporaryKey.pfx,
pfxFile, false);
this-ConvertToWindowsSlash(pfxFile);
@@ -2518,8 +2522,6 @@ void cmVisualStudio10TargetGenerator::WriteMissingFiles()
void cmVisualStudio10TargetGenerator::WriteMissingFilesWP80()
{
- std::string baseFolder = this-Makefile-GetStartOutputDirectory() +
- std::string(/) + this-Target-GetName();
std::string templateFolder = cmSystemTools::GetCMakeRoot() +
/Templates/Windows;
@@ -2528,248 +2530,250 @@ void
cmVisualStudio10TargetGenerator::WriteMissingFilesWP80()
// folders
std::string manifestFile = this-Makefile-GetStartOutputDirectory() +
std::string(/WMAppManifest.xml);
+ std::string artifactDir =
+this-LocalGenerator-GetTargetDirectory(*this-Target);
+ this-ConvertToWindowsSlash(artifactDir);
+ std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
+ std::string targetNameXML = cmVS10EscapeXML(this-Target-GetName());
cmGeneratedFileStream fout(manifestFile.c_str());
fout.SetCopyIfDifferent(true);
- fout ?xml version=\1.0\ encoding=\utf-8\?\n
- Deployment xmlns=
- \http://schemas.microsoft.com/windowsphone/2012/deployment\;
-
[Cmake-commits] CMake branch, next, updated. v3.0.1-4985-gbc419fa
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 bc419fa05ee44b12ace8db8dd1eab1615eaf82d4 (commit)
via ce40a377935cd05e50230d844f2fe579ef5dfb41 (commit)
from f13f913f7cbde7616e2a2fc2209e087967ecba58 (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=bc419fa05ee44b12ace8db8dd1eab1615eaf82d4
commit bc419fa05ee44b12ace8db8dd1eab1615eaf82d4
Merge: f13f913 ce40a37
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Aug 20 10:19:28 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Aug 20 10:19:28 2014 -0400
Merge topic 'vs-masm' into next
ce40a377 VS: Skip MASM test on MSVC 13.0
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ce40a377935cd05e50230d844f2fe579ef5dfb41
commit ce40a377935cd05e50230d844f2fe579ef5dfb41
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Aug 20 10:19:00 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Aug 20 10:19:00 2014 -0400
VS: Skip MASM test on MSVC 13.0
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 48e1c82..f237f21 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1679,7 +1679,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
list(APPEND TEST_BUILD_DIRS ${CMake_BINARY_DIR}/Tests/MFC)
endif()
- if(MSVC AND NOT MSVC_VERSION LESS 1300
+ if(MSVC AND NOT MSVC_VERSION LESS 1310
AND NOT CMAKE_GENERATOR MATCHES Visual Studio [6789]( |$))
ADD_TEST_MACRO(VSMASM VSMASM)
endif()
---
Summary of changes:
Tests/CMakeLists.txt |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.0.1-4987-g6e35477
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 6e354771a8f8a7ec95e878eb658a56800b6c8639 (commit)
via df3b007d7f904f8de5877f3e05b629239af7220a (commit)
from bc419fa05ee44b12ace8db8dd1eab1615eaf82d4 (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=6e354771a8f8a7ec95e878eb658a56800b6c8639
commit 6e354771a8f8a7ec95e878eb658a56800b6c8639
Merge: bc419fa df3b007
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Aug 20 10:20:49 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Aug 20 10:20:49 2014 -0400
Merge topic 'vs-masm' into next
df3b007d VS: Add test for MASM support
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df3b007d7f904f8de5877f3e05b629239af7220a
commit df3b007d7f904f8de5877f3e05b629239af7220a
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Aug 7 14:53:57 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Aug 20 10:19:49 2014 -0400
VS: Add test for MASM support
It is now expected to work with VS = 10 and MSVC = 13.1.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index ca7fcdc..f237f21 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1679,6 +1679,11 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
list(APPEND TEST_BUILD_DIRS ${CMake_BINARY_DIR}/Tests/MFC)
endif()
+ if(MSVC AND NOT MSVC_VERSION LESS 1310
+ AND NOT CMAKE_GENERATOR MATCHES Visual Studio [6789]( |$))
+ADD_TEST_MACRO(VSMASM VSMASM)
+ endif()
+
if(${CMAKE_GENERATOR} MATCHES Visual Studio)
if(NOT MSVC60)
ADD_TEST_MACRO(SBCS SBCS)
diff --git a/Tests/VSMASM/CMakeLists.txt b/Tests/VSMASM/CMakeLists.txt
new file mode 100644
index 000..f2570a3
--- /dev/null
+++ b/Tests/VSMASM/CMakeLists.txt
@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 2.8.12)
+project(VSMASM C ASM_MASM)
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+ add_definitions(-DTESTx64)
+else()
+ add_definitions(-DTESTi386)
+ set(CMAKE_ASM_MASM_FLAGS ${CMAKE_ASM_MASM_FLAGS} /safeseh)
+endif()
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
+add_executable(VSMASM main.c foo.asm)
diff --git a/Tests/VSMASM/foo.asm b/Tests/VSMASM/foo.asm
new file mode 100644
index 000..51cb969
--- /dev/null
+++ b/Tests/VSMASM/foo.asm
@@ -0,0 +1,7 @@
+ifndef TESTx64
+.386
+.model flat, c
+endif
+.code
+include foo-proc.asm
+end
diff --git a/Tests/VSMASM/include/foo-proc.asm
b/Tests/VSMASM/include/foo-proc.asm
new file mode 100644
index 000..e8ba5dc
--- /dev/null
+++ b/Tests/VSMASM/include/foo-proc.asm
@@ -0,0 +1,4 @@
+foo proc public
+ mov eax,0
+ ret
+foo endp
diff --git a/Tests/VSMASM/main.c b/Tests/VSMASM/main.c
new file mode 100644
index 000..570ba16
--- /dev/null
+++ b/Tests/VSMASM/main.c
@@ -0,0 +1,2 @@
+extern int foo(void);
+int main(void) { return foo(); }
---
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.0.1-1735-g16afcca
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 16afccac0542cff1ee440eaa77512ba35223ea78 (commit) via 914db028da1fc488df202a0c8705d1d5a8c258d1 (commit) from c570be01a4a9d2235560feaaddd7cdad955c0d69 (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=16afccac0542cff1ee440eaa77512ba35223ea78 commit 16afccac0542cff1ee440eaa77512ba35223ea78 Merge: c570be0 914db02 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Aug 20 10:25:51 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Aug 20 10:25:51 2014 -0400 Merge topic 'check-flag-for-intel' 914db028 Check*CompilerFlag: Add another pattern for Intel (#15096) --- Summary of changes: Modules/CMakeCheckCompilerFlagCommonPatterns.cmake |1 + 1 file changed, 1 insertion(+) 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.0.1-4990-gd963457
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 d963457e4425185f3235c950538bd4056959889c (commit) via 16afccac0542cff1ee440eaa77512ba35223ea78 (commit) via c570be01a4a9d2235560feaaddd7cdad955c0d69 (commit) from 6e354771a8f8a7ec95e878eb658a56800b6c8639 (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=d963457e4425185f3235c950538bd4056959889c commit d963457e4425185f3235c950538bd4056959889c Merge: 6e35477 16afcca Author: Brad King brad.k...@kitware.com AuthorDate: Wed Aug 20 10:27:30 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Wed Aug 20 10:27:30 2014 -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.0.1-1736-g4517d6b
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 4517d6b7572e4f0656759c9b361326a8604c92a9 (commit) from 16afccac0542cff1ee440eaa77512ba35223ea78 (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=4517d6b7572e4f0656759c9b361326a8604c92a9 commit 4517d6b7572e4f0656759c9b361326a8604c92a9 Author: Kitware Robot kwro...@kitware.com AuthorDate: Thu Aug 21 00:01:07 2014 -0400 Commit: Kitware Robot kwro...@kitware.com CommitDate: Thu Aug 21 00:01:07 2014 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 7345b1b..70bd0f8 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 0) -set(CMake_VERSION_PATCH 20140820) +set(CMake_VERSION_PATCH 20140821) #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
