[Cmake-commits] CMake branch, master, updated. v3.11.1-616-g52ae29e
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 52ae29e63baca0f49e5dda0e820b014bfdc56bbe (commit) from 83e3b1497d4889f8dbb7238a270296377035e40b (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=52ae29e63baca0f49e5dda0e820b014bfdc56bbe commit 52ae29e63baca0f49e5dda0e820b014bfdc56bbe Author: Kitware Robot AuthorDate: Thu Apr 26 00:01:04 2018 -0400 Commit: Kitware Robot CommitDate: Thu Apr 26 00:01:04 2018 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 9c7f26e..785cb92 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 11) -set(CMake_VERSION_PATCH 20180425) +set(CMake_VERSION_PATCH 20180426) #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 https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.11.1-615-g83e3b14
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 83e3b1497d4889f8dbb7238a270296377035e40b (commit)
via 9df096633bf64a6b3f6db6489e422715a6aecbf9 (commit)
via 22e483744290a27c17cca42e22ed47ef1b37007d (commit)
via 5a6c6292898fe238f3a5105133b8904209fbedaf (commit)
via dc3401d5b08ea0c116fd5416c4d7eb5fe22e5835 (commit)
via 7d756f37cc0dcd3dfff1c8524db5943af023cff8 (commit)
via 946846aaf5f2f29c27769a5be0021d21ec2ae542 (commit)
via 0b992b97517136ba21b93860ff4686b75bc962aa (commit)
via 60cb75e4a196c97e55d535486e2d28630afb3f6e (commit)
via f59c33a763ba1483129f0e721bc2394bb7442876 (commit)
via d58d4daa6b2e36c6e2318e4d67271542dca79ee6 (commit)
from e5d15848ca6cdc52ff44edcde7689518793a5eb6 (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=83e3b1497d4889f8dbb7238a270296377035e40b
commit 83e3b1497d4889f8dbb7238a270296377035e40b
Merge: 9df0966 dc3401d
Author: Brad King
AuthorDate: Wed Apr 25 08:59:00 2018 -0400
Commit: Brad King
CommitDate: Wed Apr 25 08:59:00 2018 -0400
Merge branch 'release-3.11'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9df096633bf64a6b3f6db6489e422715a6aecbf9
commit 9df096633bf64a6b3f6db6489e422715a6aecbf9
Merge: 22e4837 7d756f3
Author: Brad King
AuthorDate: Wed Apr 25 12:58:34 2018 +
Commit: Kitware Robot
CommitDate: Wed Apr 25 08:58:39 2018 -0400
Merge topic 'BLAS-no-target-in-libs'
7d756f37cc FindBLAS: do not write an imported target name into
BLAS_LIBRARIES
946846aaf5 FindPkgConfig: do not unset unused variable
Acked-by: Kitware Robot
Merge-request: !2006
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=22e483744290a27c17cca42e22ed47ef1b37007d
commit 22e483744290a27c17cca42e22ed47ef1b37007d
Merge: 5a6c629 60cb75e
Author: Brad King
AuthorDate: Wed Apr 25 12:57:01 2018 +
Commit: Kitware Robot
CommitDate: Wed Apr 25 08:57:08 2018 -0400
Merge topic 'fix-CMAKE_DISABLE_SOURCE_CHANGES-top-dir'
60cb75e4a1 Fix CMAKE_DISABLE_SOURCE_CHANGES recognition of top of build tree
Acked-by: Kitware Robot
Merge-request: !2001
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5a6c6292898fe238f3a5105133b8904209fbedaf
commit 5a6c6292898fe238f3a5105133b8904209fbedaf
Merge: e5d1584 f59c33a
Author: Brad King
AuthorDate: Wed Apr 25 12:56:06 2018 +
Commit: Kitware Robot
CommitDate: Wed Apr 25 08:56:16 2018 -0400
Merge topic 'vs-dedup-custom-commands'
f59c33a763 VS: Generate a custom command only in the least dependent target
d58d4daa6b cmVisualStudio10TargetGenerator: Use
cmLocalVisualStudio10Generator
Acked-by: Kitware Robot
Merge-request: !1889
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f59c33a763ba1483129f0e721bc2394bb7442876
commit f59c33a763ba1483129f0e721bc2394bb7442876
Author: Fujii Hironori
AuthorDate: Fri Mar 23 15:44:42 2018 +0900
Commit: Fujii Hironori
CommitDate: Mon Apr 23 13:31:28 2018 +0900
VS: Generate a custom command only in the least dependent target
If a custom command is assigned to multiple targets, generate the build
rule only in the least-dependent `.vcxproj` file. Otherwise MSBuild
will run the command on the first build of a dependent target even if
its dependencies already brought the command up to date (in order to
populates its build log).
Generate targets in least-to-most-dependent order, and assign a custom
command to the least dependent target.
Added cmLocalVisualStudio10Generator::GenerateTargetsDepthFirst to call
cmVisualStudio10TargetGenerator::Generate in least-dependent order.
Moved SourcesVisited from cmVisualStudio10TargetGenerator to
cmLocalVisualStudio10Generator to avoid attaching a custom command to
multiple targets among the local generator.
Fixes: #16767
diff --git a/Source/cmLocalVisualStudio10Generator.cxx
b/Source/cmLocalVisualStudio10Generator.cxx
index 2803d4a..5b6e781 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -62,21 +62,47 @@
cmLocalVisualStudio10Generator::~cmLocalVisualStudio10Generator()
{
}
+void cmLocalVisualStudio10Generator::GenerateTargetsDepthFirst(
+ cmGeneratorTarget* target, std::vector& remaining)
+{
+ if (target->GetType() == cmStateEnums::INTERFACE_LIBRARY) {
+return;
+ }
+ // Find this target in the list of remaining targets.
+ auto it = std::find(remaining.begin(), remaining.end(), target);
+ if (it == remaining.end()) {
+
[Cmake-commits] CMake branch, release, updated. v3.11.1-7-gdc3401d
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 dc3401d5b08ea0c116fd5416c4d7eb5fe22e5835 (commit) via 7d756f37cc0dcd3dfff1c8524db5943af023cff8 (commit) via 946846aaf5f2f29c27769a5be0021d21ec2ae542 (commit) via 0b992b97517136ba21b93860ff4686b75bc962aa (commit) via 60cb75e4a196c97e55d535486e2d28630afb3f6e (commit) from c86386caa3b4ace68573b1eeea45da40f304db3f (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: Modules/FindBLAS.cmake |6 +- Modules/FindPkgConfig.cmake |1 - Source/cmMakefile.cxx |3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.11.1-604-ge5d1584
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 e5d15848ca6cdc52ff44edcde7689518793a5eb6 (commit) via 8fd76452a46b89450a1d3a5d5eb5c96541dc20a1 (commit) via 52c11e4f646404ea75e013c358196f64cb1a925e (commit) via 92eae6b72d5e57c8f42781b8c40545d6db348488 (commit) via 8d1ccbc693398b3ac67aa6f0cf222c6ed78fc9b8 (commit) via 7b1c5f9f05bb8f3b48a5284cc236f1b483b70cf9 (commit) via bff4651f2e077350d1c8b691d9fce5dd57bb6f69 (commit) via 6dcd1bfa39684c952730904a43e268f42bf98301 (commit) from 7e4e14219dd93eae6fbe092fbe0cb403d4194abc (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=e5d15848ca6cdc52ff44edcde7689518793a5eb6 commit e5d15848ca6cdc52ff44edcde7689518793a5eb6 Merge: 8fd7645 8d1ccbc Author: Brad King AuthorDate: Wed Apr 25 12:53:49 2018 + Commit: Kitware Robot CommitDate: Wed Apr 25 08:53:54 2018 -0400 Merge topic 'vs-hlsl-object-name' 8d1ccbc693 VS: Add VS_SHADER_OBJECT_FILE_NAME source file property Acked-by: Kitware Robot Merge-request: !1997 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8fd76452a46b89450a1d3a5d5eb5c96541dc20a1 commit 8fd76452a46b89450a1d3a5d5eb5c96541dc20a1 Merge: 52c11e4 7b1c5f9 Author: Brad King AuthorDate: Wed Apr 25 12:52:53 2018 + Commit: Kitware Robot CommitDate: Wed Apr 25 08:53:01 2018 -0400 Merge topic 'testbigendian-cache-check-fix' 7b1c5f9f05 TestBigEndian: Include CheckTypeSize outside macro Acked-by: Kitware Robot Merge-request: !1999 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=52c11e4f646404ea75e013c358196f64cb1a925e commit 52c11e4f646404ea75e013c358196f64cb1a925e Merge: 92eae6b 6dcd1bf Author: Brad King AuthorDate: Wed Apr 25 12:52:08 2018 + Commit: Kitware Robot CommitDate: Wed Apr 25 08:52:15 2018 -0400 Merge topic 'file_install_always_out_of_date_fix' 6dcd1bfa39 file(INSTALL): Preserve file time when writing NTFS alternate stream Acked-by: Kitware Robot Merge-request: !1992 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=92eae6b72d5e57c8f42781b8c40545d6db348488 commit 92eae6b72d5e57c8f42781b8c40545d6db348488 Merge: 7e4e142 bff4651 Author: Brad King AuthorDate: Wed Apr 25 12:50:52 2018 + Commit: Kitware Robot CommitDate: Wed Apr 25 08:51:03 2018 -0400 Merge topic 'cuda-no-cache-host-compiler' bff4651f2e CUDA: Do not create CMAKE_CUDA_HOST_COMPILER cache entry Acked-by: Kitware Robot Merge-request: !2003 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d1ccbc693398b3ac67aa6f0cf222c6ed78fc9b8 commit 8d1ccbc693398b3ac67aa6f0cf222c6ed78fc9b8 Author: Jeremiah van Oosten AuthorDate: Mon Apr 23 15:04:10 2018 +0200 Commit: Brad King CommitDate: Tue Apr 24 11:29:16 2018 -0400 VS: Add VS_SHADER_OBJECT_FILE_NAME source file property diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst index d141479..b3e2fec 100644 --- a/Help/manual/cmake-properties.7.rst +++ b/Help/manual/cmake-properties.7.rst @@ -405,6 +405,7 @@ Properties on Source Files /prop_sf/VS_SHADER_ENTRYPOINT /prop_sf/VS_SHADER_FLAGS /prop_sf/VS_SHADER_MODEL + /prop_sf/VS_SHADER_OBJECT_FILE_NAME /prop_sf/VS_SHADER_OUTPUT_HEADER_FILE /prop_sf/VS_SHADER_TYPE /prop_sf/VS_SHADER_VARIABLE_NAME diff --git a/Help/prop_sf/VS_SHADER_OBJECT_FILE_NAME.rst b/Help/prop_sf/VS_SHADER_OBJECT_FILE_NAME.rst new file mode 100644 index 000..093bcc6 --- /dev/null +++ b/Help/prop_sf/VS_SHADER_OBJECT_FILE_NAME.rst @@ -0,0 +1,6 @@ +VS_SHADER_OBJECT_FILE_NAME +-- + +Specifies a file name for the compiled shader object file for an ``.hlsl`` +source file. This adds the ``-Fo`` flag to the command line for the FxCompiler +tool. diff --git a/Help/release/dev/vs-hlsl-object-name.rst b/Help/release/dev/vs-hlsl-object-name.rst new file mode 100644 index 000..625e5ee --- /dev/null +++ b/Help/release/dev/vs-hlsl-object-name.rst @@ -0,0 +1,6 @@ +vs-hlsl-object-name +--- + +* HLSL source file property :prop_sf:`VS_SHADER_OBJECT_FILE_NAME` has been + added to the :ref:`Visual Studio Generators` for VS 2010 and above. + The property specifies the file name of the compiled shader object. diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index b56104e..1a618a0 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -1590,6 +1590,7 @@ void cmVisualStudio10TargetGenerator::WriteExtra
