[Cmake-commits] CMake branch, master, updated. v3.8.0-rc1-360-ga52d35b

2017-03-01 Thread Kitware Robot 
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  a52d35b8ef75ea4b6c9411d24450fc17706fdc9f (commit)
  from  ebc28c156ee56c878990c53cbd62779249b139bb (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=a52d35b8ef75ea4b6c9411d24450fc17706fdc9f
commit a52d35b8ef75ea4b6c9411d24450fc17706fdc9f
Author: Kitware Robot <kwro...@kitware.com>
AuthorDate: Thu Mar 2 00:01:03 2017 -0500
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Mar 2 00:01:03 2017 -0500

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index f85bd64..62324e8 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 8)
-set(CMake_VERSION_PATCH 20170301)
+set(CMake_VERSION_PATCH 20170302)
 #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.8.0-rc1-716-g6a1c761

2017-03-01 Thread Daniel Pfeifer 
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  6a1c76184210f5dc289293bb27d5d322c0a5f67d (commit)
   via  e1418249313f35511a3162242d626785e4f51144 (commit)
  from  a1cca83f3823109ad2728c3664b8895b5b528244 (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=6a1c76184210f5dc289293bb27d5d322c0a5f67d
commit 6a1c76184210f5dc289293bb27d5d322c0a5f67d
Merge: a1cca83 e141824
Author: Daniel Pfeifer 
AuthorDate: Wed Mar 1 17:25:41 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Mar 1 17:25:41 2017 -0500

Merge topic 'modernize-deprecated-headers' into next

e1418249 Modernize deprecated headers


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e1418249313f35511a3162242d626785e4f51144
commit e1418249313f35511a3162242d626785e4f51144
Author: Daniel Pfeifer 
AuthorDate: Wed Mar 1 23:23:09 2017 +0100
Commit: Daniel Pfeifer 
CommitDate: Wed Mar 1 23:23:09 2017 +0100

Modernize deprecated headers

Replace C standard library headers in C++ code with their C++
alternatives.

diff --git a/Source/CPack/IFW/cmCPackIFWInstaller.cxx 
b/Source/CPack/IFW/cmCPackIFWInstaller.cxx
index d8bafee..71814bb 100644
--- a/Source/CPack/IFW/cmCPackIFWInstaller.cxx
+++ b/Source/CPack/IFW/cmCPackIFWInstaller.cxx
@@ -3,8 +3,8 @@
 #include "cmCPackIFWInstaller.h"
 
 #include 
+#include 
 #include 
-#include 
 #include 
 
 #include "CPack/cmCPackGenerator.h"
diff --git a/Source/CPack/IFW/cmCPackIFWPackage.cxx 
b/Source/CPack/IFW/cmCPackIFWPackage.cxx
index e23b1b9..7bf34ce 100644
--- a/Source/CPack/IFW/cmCPackIFWPackage.cxx
+++ b/Source/CPack/IFW/cmCPackIFWPackage.cxx
@@ -13,9 +13,9 @@
 #include "cmXMLWriter.h"
 
 #include 
+#include 
 #include 
 #include 
-#include 
 
 //- Logger ---
 #ifdef cmCPackLogger
diff --git a/Source/CPack/IFW/cmCPackIFWRepository.cxx 
b/Source/CPack/IFW/cmCPackIFWRepository.cxx
index cc204e8..ed4cb4e 100644
--- a/Source/CPack/IFW/cmCPackIFWRepository.cxx
+++ b/Source/CPack/IFW/cmCPackIFWRepository.cxx
@@ -10,7 +10,7 @@
 #include "cmXMLWriter.h"
 
 #include 
-#include 
+#include 
 
 #ifdef cmCPackLogger
 #undef cmCPackLogger
diff --git a/Source/CPack/OSXScriptLauncher.cxx 
b/Source/CPack/OSXScriptLauncher.cxx
index b159e64..689633a 100644
--- a/Source/CPack/OSXScriptLauncher.cxx
+++ b/Source/CPack/OSXScriptLauncher.cxx
@@ -3,8 +3,8 @@
 #include 
 #include 
 #include 
+#include 
 #include 
-#include 
 #include 
 #include 
 
diff --git a/Source/CPack/cmCPackDebGenerator.cxx 
b/Source/CPack/cmCPackDebGenerator.cxx
index 5c50da8..28b5a78 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -9,13 +9,13 @@
 #include "cmGeneratedFileStream.h"
 #include "cmSystemTools.h"
 
+#include 
 #include 
-#include 
+#include 
+#include 
 #include 
 #include 
 #include 
-#include 
-#include 
 #include 
 #include 
 
diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx 
b/Source/CPack/cmCPackDragNDropGenerator.cxx
index ec5fc88..df6ee22 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.cxx
+++ b/Source/CPack/cmCPackDragNDropGenerator.cxx
@@ -9,9 +9,9 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
-#include 
 
 #include 
 
diff --git a/Source/CPack/cmCPackDragNDropGenerator.h 
b/Source/CPack/cmCPackDragNDropGenerator.h
index 876eab7..0e7b9f4 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.h
+++ b/Source/CPack/cmCPackDragNDropGenerator.h
@@ -4,8 +4,8 @@
 #define cmCPackDragNDropGenerator_h
 
 #include 
+#include 
 #include 
-#include 
 #include 
 #include 
 
diff --git a/Source/CPack/cmCPackLog.h b/Source/CPack/cmCPackLog.h
index a988ccc..d699f05 100644
--- a/Source/CPack/cmCPackLog.h
+++ b/Source/CPack/cmCPackLog.h
@@ -5,8 +5,8 @@
 
 #include  // IWYU pragma: keep
 
+#include 
 #include 
-#include 
 #include 
 
 #define cmCPack_Log(ctSelf, logType, msg) \
diff --git a/Source/CPack/cmCPackNSISGenerator.cxx 
b/Source/CPack/cmCPackNSISGenerator.cxx
index 1940953..690f6f3 100644
--- a/Source/CPack/cmCPackNSISGenerator.cxx
+++ b/Source/CPack/cmCPackNSISGenerator.cxx
@@ -11,10 +11,10 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
-#include 
-#include 
 #include 
 
 /* NSIS uses different command line syntax on Windows and others */
diff --git a/Source/CPack/cmCPackPackageMakerGenerator.cxx 
b/Source/CPack/cmCPackPackageMakerGenerator.cxx
index 8000d6e..719f7b2 100644
---

[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-714-ga1cca83

2017-03-01 Thread Brad King 
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  a1cca83f3823109ad2728c3664b8895b5b528244 (commit)
   via  506207f928bfc8853864edb9a200a38e7ac2b02b (commit)
   via  a202749c46f84563a6cccf6d5d31808fddf53408 (commit)
   via  9588d0a2e2442e6cc07dd4563399e257d95c792b (commit)
  from  59c494b6956cfef51da86dd617aa7d5debe27557 (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=a1cca83f3823109ad2728c3664b8895b5b528244
commit a1cca83f3823109ad2728c3664b8895b5b528244
Merge: 59c494b 506207f
Author: Brad King 
AuthorDate: Wed Mar 1 15:34:38 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Mar 1 15:34:38 2017 -0500

Merge topic 'csproj_add_free_source_tags' into next

506207f9 VS: add test for VS_CSHARP_* source file property
a202749c VS: add CSharpUtilities module
9588d0a2 VS: add VS_CSHARP_ sourcefile property


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=506207f928bfc8853864edb9a200a38e7ac2b02b
commit 506207f928bfc8853864edb9a200a38e7ac2b02b
Author: Michael Stürmer 
AuthorDate: Fri Feb 24 09:28:13 2017 +0100
Commit: Brad King 
CommitDate: Wed Mar 1 15:31:05 2017 -0500

VS: add test for VS_CSHARP_* source file property

diff --git a/Tests/RunCMake/VS10Project/RunCMakeTest.cmake 
b/Tests/RunCMake/VS10Project/RunCMakeTest.cmake
index bc1ec97..3af877f 100644
--- a/Tests/RunCMake/VS10Project/RunCMakeTest.cmake
+++ b/Tests/RunCMake/VS10Project/RunCMakeTest.cmake
@@ -3,3 +3,4 @@ run_cmake(VsConfigurationType)
 run_cmake(VsTargetsFileReferences)
 run_cmake(VsCustomProps)
 run_cmake(VsDebuggerWorkingDir)
+run_cmake(VsCSharpCustomTags)
diff --git a/Tests/RunCMake/VS10Project/VsCSharpCustomTags-check.cmake 
b/Tests/RunCMake/VS10Project/VsCSharpCustomTags-check.cmake
new file mode 100644
index 000..70ea193
--- /dev/null
+++ b/Tests/RunCMake/VS10Project/VsCSharpCustomTags-check.cmake
@@ -0,0 +1,23 @@
+set(csProjectFile "${RunCMake_TEST_BINARY_DIR}/foo.csproj")
+if(NOT EXISTS "${csProjectFile}")
+  set(RunCMake_TEST_FAILED "Project file ${csProjectFile} does not exist.")
+  return()
+endif()
+
+set(tagFound FALSE)
+
+set(tagName "MyCustomTag")
+set(tagValue "MyCustomValue")
+
+file(STRINGS "${csProjectFile}" lines)
+foreach(line IN LISTS lines)
+  if(line MATCHES "^ *<${tagName}>${tagValue}")
+message(STATUS "foo.csproj has tag ${tagName} with value ${tagValue} 
defined")
+set(tagFound TRUE)
+  endif()
+endforeach()
+
+if(NOT tagFound)
+  set(RunCMake_TEST_FAILED "Source file tag ${tagName} with value ${tagValue} 
not found.")
+  return()
+endif()
diff --git a/Tests/RunCMake/VS10Project/VsCSharpCustomTags.cmake 
b/Tests/RunCMake/VS10Project/VsCSharpCustomTags.cmake
new file mode 100644
index 000..c51e9c3
--- /dev/null
+++ b/Tests/RunCMake/VS10Project/VsCSharpCustomTags.cmake
@@ -0,0 +1,11 @@
+enable_language(CSharp)
+add_library(foo foo.cs)
+
+set(props_file "${CMAKE_CURRENT_SOURCE_DIR}/my.props")
+
+set(tagName "MyCustomTag")
+set(tagValue "MyCustomValue")
+
+set_source_files_properties(foo.cs
+  PROPERTIES
+  VS_CSHARP_${tagName} "${tagValue}")
diff --git a/Tests/RunCMake/VS10Project/foo.cs 
b/Tests/RunCMake/VS10Project/foo.cs
new file mode 100644
index 000..3695dc9
--- /dev/null
+++ b/Tests/RunCMake/VS10Project/foo.cs
@@ -0,0 +1,3 @@
+void foo()
+{
+}

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a202749c46f84563a6cccf6d5d31808fddf53408
commit a202749c46f84563a6cccf6d5d31808fddf53408
Author: Michael Stürmer 
AuthorDate: Thu Feb 23 16:49:37 2017 +0100
Commit: Brad King 
CommitDate: Wed Mar 1 15:31:05 2017 -0500

VS: add CSharpUtilities module

diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst
index d4712ba..c478a1b 100644
--- a/Help/manual/cmake-modules.7.rst
+++ b/Help/manual/cmake-modules.7.rst
@@ -66,6 +66,7 @@ All Modules
/module/CPackRPM
/module/CPack
/module/CPackWIX
+   /module/CSharpUtilities
/module/CTest
/module/CTestCoverageCollectGCOV
/module/CTestScriptMode
diff --git a/Help/module/CSharpUtilities.rst b/Help/module/CSharpUtilities.rst
new file mode 100644
index 000..3621bbc
--- /dev/null
+++ b/Help/module/CSharpUtilities.rst
@@ -0,0 +1 @@
+.. cmake-module:: ../../Modules/CSharpUtilities.cmake
diff --git a/Help/release/3.8.rst b/Help/release/3.8.rst
index a9bfe84..efb2aa5 100644
--- a/Help/release/3.8.rst
+++ b/Help/release/3.8.rst
@@ -220,6 +220,11 @@ Properties
 Modules
 ---
 
+* A

[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-710-g59c494b

2017-03-01 Thread Brad King 
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  59c494b6956cfef51da86dd617aa7d5debe27557 (commit)
   via  690af1efc6b18018e4b1f3468edfb36d322156db (commit)
  from  8d4d7c1468690e96c24c912b9a4239477166ca5d (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=59c494b6956cfef51da86dd617aa7d5debe27557
commit 59c494b6956cfef51da86dd617aa7d5debe27557
Merge: 8d4d7c1 690af1e
Author: Brad King 
AuthorDate: Wed Mar 1 15:34:15 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Mar 1 15:34:15 2017 -0500

Merge topic 'csproj_add_free_source_tags' into next

690af1ef fixup! VS: add VS_CSHARP_ sourcefile property


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=690af1efc6b18018e4b1f3468edfb36d322156db
commit 690af1efc6b18018e4b1f3468edfb36d322156db
Author: Brad King 
AuthorDate: Wed Mar 1 15:33:57 2017 -0500
Commit: Brad King 
CommitDate: Wed Mar 1 15:33:57 2017 -0500

fixup! VS: add VS_CSHARP_ sourcefile property

diff --git a/Help/release/3.8.rst b/Help/release/3.8.rst
index 936afa0..efb2aa5 100644
--- a/Help/release/3.8.rst
+++ b/Help/release/3.8.rst
@@ -34,15 +34,6 @@ C#
   Visual Studio (``VS_*``) are worth a look (for setting toolset
   versions, root namespaces, assembly icons, ...).
 
-* Auto-linking in ``.csproj`` files: In C#/.NET development with
-  Visual Studio there are a number of visual editors used which
-  generate code.  Both the generated files and the ones edited
-  with the UI are connected in the ``.csproj`` file using
-   tags.  If CMake finds within a C# project
-  any source file with extension ``.Designer.cs`` or ``.xaml.cs``,
-  it checks sibling files with extension ``.xaml``, ``.settings``,
-  ``.resx`` or ``.cs`` and establishes the dependency connection.
-
 CUDA
 
 

---

Summary of changes:
 Help/release/3.8.rst |9 -
 1 file changed, 9 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.8.0-rc1-708-g8d4d7c1

2017-03-01 Thread Brad King 
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  8d4d7c1468690e96c24c912b9a4239477166ca5d (commit)
   via  bd4045067cd170870cbceb5401f0fc28b11d4e5b (commit)
  from  87429d96864221e36f0e33362f8ba4ae2b885c7a (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=8d4d7c1468690e96c24c912b9a4239477166ca5d
commit 8d4d7c1468690e96c24c912b9a4239477166ca5d
Merge: 87429d9 bd40450
Author: Brad King 
AuthorDate: Wed Mar 1 15:18:51 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Mar 1 15:18:51 2017 -0500

Merge topic 'autogen_uic_paths' into next

bd404506 fixup! Autogen: Add subDirPrefix function


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd4045067cd170870cbceb5401f0fc28b11d4e5b
commit bd4045067cd170870cbceb5401f0fc28b11d4e5b
Author: Brad King 
AuthorDate: Wed Mar 1 15:18:30 2017 -0500
Commit: Brad King 
CommitDate: Wed Mar 1 15:18:30 2017 -0500

fixup! Autogen: Add subDirPrefix function

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 26dc376..c83f9a9 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -112,7 +112,7 @@ static void SettingWrite(std::ostream& ostr, const char* 
key,
   }
 }
 
-std::string subDirPrefix(const std::string fileName)
+std::string subDirPrefix(const std::string& fileName)
 {
   std::string res(cmsys::SystemTools::GetFilenamePath(fileName));
   if (!res.empty()) {

---

Summary of changes:
 Source/cmQtAutoGenerators.cxx |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.8.0-rc1-706-g87429d9

2017-03-01 Thread Brad King 
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  87429d96864221e36f0e33362f8ba4ae2b885c7a (commit)
   via  503f25d490e56dfc1d3dc894e1fc1bd3e7e89e81 (commit)
  from  38c9f229707f23329d420ed563a7dec26bb69318 (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=87429d96864221e36f0e33362f8ba4ae2b885c7a
commit 87429d96864221e36f0e33362f8ba4ae2b885c7a
Merge: 38c9f22 503f25d
Author: Brad King 
AuthorDate: Wed Mar 1 13:35:16 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Mar 1 13:35:16 2017 -0500

Merge topic 'find_library-custom-lib-suffix' into next

503f25d4 find_library: Allow custom lib suffix be used as find path


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=503f25d490e56dfc1d3dc894e1fc1bd3e7e89e81
commit 503f25d490e56dfc1d3dc894e1fc1bd3e7e89e81
Author: Christian Schmidbauer 
AuthorDate: Sat Feb 25 19:47:49 2017 +0100
Commit: Brad King 
CommitDate: Wed Mar 1 09:49:42 2017 -0500

find_library: Allow custom lib suffix be used as find path

Add a new `CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX` variable to allow use
of a custom suffix on `lib` directory names.  This is a more general
option than that added by commit v3.7.0-rc1~504^2 (Teach find_library
and find_package to search lib32 paths, 2016-06-10).  It allows the find
path to be more deterministic on custom setups.

See discussion in #10287 and #15994.

diff --git a/Help/command/find_library.rst b/Help/command/find_library.rst
index 1eb50f7..e912040 100644
--- a/Help/command/find_library.rst
+++ b/Help/command/find_library.rst
@@ -49,6 +49,13 @@ path to the framework ``/A.framework``.  When a 
full path to a
 framework is used as a library, CMake will use a ``-framework A``, and a
 ``-F`` to link the framework to the target.
 
+If the :variable:`CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX` variable is set all
+search paths will be tested as normal, with the suffix appended, and with
+all matches of ``lib/`` replaced with
+``lib${CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX}/``.  This variable overrides
+the :prop_gbl:`FIND_LIBRARY_USE_LIB32_PATHS`
+and :prop_gbl:`FIND_LIBRARY_USE_LIB64_PATHS` global properties.
+
 If the :prop_gbl:`FIND_LIBRARY_USE_LIB32_PATHS` global property is set
 all search paths will be tested as normal, with ``32/`` appended, and
 with all matches of ``lib/`` replaced with ``lib32/``.  This property is
diff --git a/Help/manual/cmake-variables.7.rst 
b/Help/manual/cmake-variables.7.rst
index 259d87b..a25efe7 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -130,6 +130,7 @@ Variables that Change Behavior
/variable/CMAKE_SYSROOT
/variable/CMAKE_FIND_APPBUNDLE
/variable/CMAKE_FIND_FRAMEWORK
+   /variable/CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX
/variable/CMAKE_FIND_LIBRARY_PREFIXES
/variable/CMAKE_FIND_LIBRARY_SUFFIXES
/variable/CMAKE_FIND_NO_INSTALL_PREFIX
diff --git a/Help/prop_gbl/FIND_LIBRARY_USE_LIB32_PATHS.rst 
b/Help/prop_gbl/FIND_LIBRARY_USE_LIB32_PATHS.rst
index ce18b65..8396026 100644
--- a/Help/prop_gbl/FIND_LIBRARY_USE_LIB32_PATHS.rst
+++ b/Help/prop_gbl/FIND_LIBRARY_USE_LIB32_PATHS.rst
@@ -8,3 +8,5 @@ Whether the :command:`find_library` command should 
automatically search
 :command:`find_library` command should automatically search the ``lib32``
 variant of directories called ``lib`` in the search path when building 32-bit
 binaries.
+
+See also the :variable:`CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX` variable.
diff --git a/Help/prop_gbl/FIND_LIBRARY_USE_LIB64_PATHS.rst 
b/Help/prop_gbl/FIND_LIBRARY_USE_LIB64_PATHS.rst
index e52f8eb..ed343ba 100644
--- a/Help/prop_gbl/FIND_LIBRARY_USE_LIB64_PATHS.rst
+++ b/Help/prop_gbl/FIND_LIBRARY_USE_LIB64_PATHS.rst
@@ -8,3 +8,5 @@ FIND_LIBRARY_USE_LIB64_PATHS is a boolean specifying whether the
 :command:`find_library` command should automatically search the lib64
 variant of directories called lib in the search path when building
 64-bit binaries.
+
+See also the :variable:`CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX` variable.
diff --git a/Help/release/dev/find_library-custom-lib-suffix.rst 
b/Help/release/dev/find_library-custom-lib-suffix.rst
new file mode 100644
index 000..824b27e
--- /dev/null
+++ b/Help/release/dev/find_library-custom-lib-suffix.rst
@@ -0,0 +1,6 @@
+find_library-custom-lib-suffix
+--
+
+* A :variable:`CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX` variable was added to
+  tell the :command:`find_library` command to search in a ``lib``
+

[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-704-g38c9f22

2017-03-01 Thread Brad King 
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  38c9f229707f23329d420ed563a7dec26bb69318 (commit)
   via  17e13e4de8095f543341e96a2fa7f4199214169a (commit)
  from  f011926fd6d07a2fe7d44d0209c3280d4b4ad27b (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=38c9f229707f23329d420ed563a7dec26bb69318
commit 38c9f229707f23329d420ed563a7dec26bb69318
Merge: f011926 17e13e4
Author: Brad King 
AuthorDate: Wed Mar 1 13:33:53 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Mar 1 13:33:53 2017 -0500

Merge topic 'implicit-dir-symlinks' into next

17e13e4d Tests: Add case for RPATH exclusion of symlinks to implicit 
directories


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=17e13e4de8095f543341e96a2fa7f4199214169a
commit 17e13e4de8095f543341e96a2fa7f4199214169a
Author: Brad King 
AuthorDate: Wed Mar 1 12:38:10 2017 -0500
Commit: Brad King 
CommitDate: Wed Mar 1 13:33:37 2017 -0500

Tests: Add case for RPATH exclusion of symlinks to implicit directories

Issue: #16682

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 63016f1..a16efb3 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -153,6 +153,9 @@ add_RunCMake_test(TargetPropertyGeneratorExpressions)
 add_RunCMake_test(Languages)
 add_RunCMake_test(LinkStatic)
 add_RunCMake_test(ObjectLibrary)
+if(UNIX AND CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG AND CMAKE_EXECUTABLE_FORMAT 
STREQUAL "ELF")
+  add_RunCMake_test(RuntimePath)
+endif()
 add_RunCMake_test(Swift)
 add_RunCMake_test(TargetObjects)
 add_RunCMake_test(TargetSources)
diff --git a/Tests/RunCMake/RuntimePath/A.c b/Tests/RunCMake/RuntimePath/A.c
new file mode 100644
index 000..e9d4195
--- /dev/null
+++ b/Tests/RunCMake/RuntimePath/A.c
@@ -0,0 +1,4 @@
+int libA(void)
+{
+  return 0;
+}
diff --git a/Tests/RunCMake/RuntimePath/CMakeLists.txt 
b/Tests/RunCMake/RuntimePath/CMakeLists.txt
new file mode 100644
index 000..a640c56
--- /dev/null
+++ b/Tests/RunCMake/RuntimePath/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 3.7)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/RuntimePath/RunCMakeTest.cmake 
b/Tests/RunCMake/RuntimePath/RunCMakeTest.cmake
new file mode 100644
index 000..a9a7f05
--- /dev/null
+++ b/Tests/RunCMake/RuntimePath/RunCMakeTest.cmake
@@ -0,0 +1,18 @@
+include(RunCMake)
+
+
+function(run_SymlinkImplicit)
+  # Use a single build tree for a few tests without cleaning.
+  set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/SymlinkImplicit-build)
+  set(RunCMake_TEST_NO_CLEAN 1)
+  if(RunCMake_GENERATOR MATCHES "Make|Ninja")
+set(RunCMake_TEST_OPTIONS -DCMAKE_BUILD_TYPE=Debug)
+  endif()
+  file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+  file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+  run_cmake(SymlinkImplicit)
+  run_cmake_command(SymlinkImplicit-build ${CMAKE_COMMAND} --build . --config 
Debug)
+  run_cmake_command(SymlinkImplicitCheck
+${CMAKE_COMMAND} -Ddir=${RunCMake_TEST_BINARY_DIR} -P 
${RunCMake_SOURCE_DIR}/SymlinkImplicitCheck.cmake)
+endfunction()
+run_SymlinkImplicit()
diff --git a/Tests/RunCMake/RuntimePath/SymlinkImplicit.cmake 
b/Tests/RunCMake/RuntimePath/SymlinkImplicit.cmake
new file mode 100644
index 000..6578f8f
--- /dev/null
+++ b/Tests/RunCMake/RuntimePath/SymlinkImplicit.cmake
@@ -0,0 +1,17 @@
+enable_language(C)
+
+set(lib_dir ${CMAKE_CURRENT_BINARY_DIR}/lib)
+set(lib_link ${CMAKE_CURRENT_BINARY_DIR}/libLink)
+set(lib_always ${CMAKE_CURRENT_BINARY_DIR}/libAlways)
+file(MAKE_DIRECTORY ${lib_dir})
+execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink lib ${lib_link})
+execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink lib ${lib_always})
+
+add_library(A SHARED A.c)
+list(APPEND CMAKE_C_IMPLICIT_LINK_DIRECTORIES ${lib_dir})
+set_property(TARGET A PROPERTY LIBRARY_OUTPUT_DIRECTORY ${lib_link})
+
+add_executable(exe main.c)
+target_link_libraries(exe A)
+set_property(TARGET exe PROPERTY RUNTIME_OUTPUT_DIRECTORY 
${CMAKE_CURRENT_BINARY_DIR}/bin)
+set_property(TARGET exe PROPERTY BUILD_RPATH ${lib_always})
diff --git a/Tests/RunCMake/RuntimePath/SymlinkImplicitCheck-result.txt 
b/Tests/RunCMake/RuntimePath/SymlinkImplicitCheck-result.txt
new file mode 100644
index 000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/RuntimePath/SymlinkImplicitCheck-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/RuntimePath/SymlinkImplicitCheck-stderr.txt

[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-702-gf011926

2017-03-01 Thread Brad King 
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  f011926fd6d07a2fe7d44d0209c3280d4b4ad27b (commit)
   via  ac7b7a6c8156f94443a94f63c02571f4c03a2315 (commit)
  from  c708c66f568477a305fd98f689608a32eff4cd4a (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=f011926fd6d07a2fe7d44d0209c3280d4b4ad27b
commit f011926fd6d07a2fe7d44d0209c3280d4b4ad27b
Merge: c708c66 ac7b7a6
Author: Brad King 
AuthorDate: Wed Mar 1 13:10:55 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Mar 1 13:10:55 2017 -0500

Merge topic 'implicit-dir-symlinks' into next

ac7b7a6c fixup! Tests: Add case for RPATH exclusion of symlinks to implicit 
directories


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ac7b7a6c8156f94443a94f63c02571f4c03a2315
commit ac7b7a6c8156f94443a94f63c02571f4c03a2315
Author: Brad King 
AuthorDate: Wed Mar 1 13:10:10 2017 -0500
Commit: Brad King 
CommitDate: Wed Mar 1 13:10:10 2017 -0500

fixup! Tests: Add case for RPATH exclusion of symlinks to implicit 
directories

diff --git a/Tests/RunCMake/RuntimePath/SymlinkImplicitCheck-stderr.txt 
b/Tests/RunCMake/RuntimePath/SymlinkImplicitCheck-stderr.txt
index ad51fd3..7115011 100644
--- a/Tests/RunCMake/RuntimePath/SymlinkImplicitCheck-stderr.txt
+++ b/Tests/RunCMake/RuntimePath/SymlinkImplicitCheck-stderr.txt
@@ -7,7 +7,7 @@
 
 .*/Tests/RunCMake/RuntimePath/SymlinkImplicit-build/exe
 
-  The current RUNPATH is:
+  The current (RPATH|RUNPATH) is:
 
 .*/Tests/RunCMake/RuntimePath/SymlinkImplicit-build/libAlways
 

---

Summary of changes:
 Tests/RunCMake/RuntimePath/SymlinkImplicitCheck-stderr.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.8.0-rc1-692-g53c4967

2017-03-01 Thread Brad King 
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  53c496702fa99a57f8f83e60c479eb39f66b2263 (commit)
   via  15140222af1c415acd227c778bbb3fdc1d03fc39 (commit)
   via  d72a73320ae4697e60d7485e953d950443345927 (commit)
   via  15c1cc55b4123ffb207d6f731ae5152bc99a1540 (commit)
   via  793a505e3cf03c6841df92f46ed0aaf15c2479d7 (commit)
   via  959748f1c963e9e2d44ef650a2faa3a82985655f (commit)
   via  92525eb7b3ad6c71610fead557185aaf8db98739 (commit)
   via  851638db8a5fdb9ae974ac32351bc936300b50c9 (commit)
   via  0abd89e0eb51b77590210f21d9095ff85771bf1d (commit)
   via  55f8d63cdbb15fbee9f3486f8511c7fa16edaaf3 (commit)
   via  db431ecfe33dbfa9eb43e4edd72ebc35b2c7c563 (commit)
  from  4d363faaf9158c54e576552620e48ac09d102765 (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=53c496702fa99a57f8f83e60c479eb39f66b2263
commit 53c496702fa99a57f8f83e60c479eb39f66b2263
Merge: 4d363fa 1514022
Author: Brad King 
AuthorDate: Wed Mar 1 11:24:02 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Mar 1 11:24:02 2017 -0500

Merge topic 'autogen_uic_paths' into next

15140222 Autogen: New short InfoGet functions
d72a7332 Autogen: Parse enabled feature configuration only
15c1cc55 Autogen: Add missing return on error
793a505e Autogen: Rename and merge moc related methods
959748f1 Autogen: Add AUTOUIC_SEARCH_PATHS release notes
92525eb7 Autogen: Add AUTOUIC_SEARCH_PATHS documentation
851638db Autogen: Add AUTOUIC_SEARCH_PATHS test
0abd89e0 Autogen: Add AUTOUIC_SEARCH_PATHS support
55f8d63c Autogen: Add subDirPrefix function
db431ecf Autogen: Merge FindInIncludeDirectories into FindIncludeFile


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15140222af1c415acd227c778bbb3fdc1d03fc39
commit 15140222af1c415acd227c778bbb3fdc1d03fc39
Author: Sebastian Holtermann 
AuthorDate: Mon Feb 27 14:22:07 2017 +0100
Commit: Sebastian Holtermann 
CommitDate: Wed Mar 1 15:30:30 2017 +0100

Autogen: New short InfoGet functions

diff --git a/Modules/AutogenInfo.cmake.in b/Modules/AutogenInfo.cmake.in
index f8ffe91..fcecb6c 100644
--- a/Modules/AutogenInfo.cmake.in
+++ b/Modules/AutogenInfo.cmake.in
@@ -16,7 +16,7 @@ set(AM_QT_UIC_EXECUTABLE @_qt_uic_executable@)
 set(AM_QT_RCC_EXECUTABLE @_qt_rcc_executable@)
 # MOC settings
 set(AM_MOC_SKIP @_moc_skip@)
-set(AM_MOC_COMPILE_DEFINITIONS @_moc_compile_defs@)
+set(AM_MOC_DEFINITIONS @_moc_compile_defs@)
 set(AM_MOC_INCLUDES @_moc_incs@)
 set(AM_MOC_OPTIONS @_moc_options@)
 set(AM_MOC_RELAXED_MODE @_moc_relaxed_mode@)
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx 
b/Source/cmQtAutoGeneratorInitializer.cxx
index 5460f73..a45b3d5 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -972,7 +972,7 @@ void cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget(
it = configMocDefines.begin(),
end = configMocDefines.end();
  it != end; ++it) {
-  infoFile << "set(AM_MOC_COMPILE_DEFINITIONS_" << it->first << " "
+  infoFile << "set(AM_MOC_DEFINITIONS_" << it->first << " "
<< it->second << ")\n";
 }
   }
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 79100fe..26dc376 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -55,20 +55,38 @@ static std::string Quoted(const std::string& text)
   return res;
 }
 
-static std::string GetConfigDefinition(cmMakefile* makefile,
-   const std::string& key,
-   const std::string& config)
+static void InfoGet(cmMakefile* makefile, const char* key, std::string& value)
 {
-  std::string keyConf = key;
-  if (!config.empty()) {
-keyConf += "_";
-keyConf += config;
+  value = makefile->GetSafeDefinition(key);
+}
+
+static void InfoGet(cmMakefile* makefile, const char* key, bool& value)
+{
+  value = makefile->IsOn(key);
+}
+
+static void InfoGet(cmMakefile* makefile, const char* key,
+std::vector& list)
+{
+  cmSystemTools::ExpandListArgument(makefile->GetSafeDefinition(key), list);
+}
+
+static void InfoGet(cmMakefile* makefile, const char* key,
+const std::string& config, std::vector& list)
+{
+  const char* valueConf = CM_NULLPTR;
+  {
+std::string keyConf = key;
+if (!config.empty()) {
+  keyConf += "_";
+  keyConf += config;
+}
+valueConf

[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-681-g4d363fa

2017-03-01 Thread Brad King 
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  4d363faaf9158c54e576552620e48ac09d102765 (commit)
   via  d698bdfd55350f68c8c810571e530345641281b3 (commit)
   via  ff741a77cdc6f777ca16a81a0929b82008e3e9a1 (commit)
   via  bd0f96baafce1ed7a50cfb130f05d49763013273 (commit)
  from  e575ac5dbe5032d5df2f89aebd2a910cdfa80b32 (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=4d363faaf9158c54e576552620e48ac09d102765
commit 4d363faaf9158c54e576552620e48ac09d102765
Merge: e575ac5 d698bdf
Author: Brad King 
AuthorDate: Wed Mar 1 09:17:45 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Mar 1 09:17:45 2017 -0500

Merge topic 'csproj_add_free_source_tags' into next

d698bdfd VS: add test for VS_CSHARP_* source file property
ff741a77 VS: add CSharpUtilities module
bd0f96ba VS: add VS_CSHARP_ sourcefile property


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d698bdfd55350f68c8c810571e530345641281b3
commit d698bdfd55350f68c8c810571e530345641281b3
Author: Michael Stürmer 
AuthorDate: Fri Feb 24 09:28:13 2017 +0100
Commit: Brad King 
CommitDate: Wed Mar 1 09:08:18 2017 -0500

VS: add test for VS_CSHARP_* source file property

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx 
b/Source/cmVisualStudio10TargetGenerator.cxx
index b3852d6..1ac2951 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -709,7 +709,7 @@ void 
cmVisualStudio10TargetGenerator::WriteEmbeddedResourceGroup()
   if (!value.empty()) {
 this->WriteString("<", 3);
 (*this->BuildFileStream) << tagName << ">";
-(*this->BuildFileStream) << value;
+(*this->BuildFileStream) << cmVS10EscapeXML(value);
 (*this->BuildFileStream) << "\n";
   }
 }
diff --git a/Tests/RunCMake/VS10Project/RunCMakeTest.cmake 
b/Tests/RunCMake/VS10Project/RunCMakeTest.cmake
index bc1ec97..3af877f 100644
--- a/Tests/RunCMake/VS10Project/RunCMakeTest.cmake
+++ b/Tests/RunCMake/VS10Project/RunCMakeTest.cmake
@@ -3,3 +3,4 @@ run_cmake(VsConfigurationType)
 run_cmake(VsTargetsFileReferences)
 run_cmake(VsCustomProps)
 run_cmake(VsDebuggerWorkingDir)
+run_cmake(VsCSharpCustomTags)
diff --git a/Tests/RunCMake/VS10Project/VsCSharpCustomTags-check.cmake 
b/Tests/RunCMake/VS10Project/VsCSharpCustomTags-check.cmake
new file mode 100644
index 000..70ea193
--- /dev/null
+++ b/Tests/RunCMake/VS10Project/VsCSharpCustomTags-check.cmake
@@ -0,0 +1,23 @@
+set(csProjectFile "${RunCMake_TEST_BINARY_DIR}/foo.csproj")
+if(NOT EXISTS "${csProjectFile}")
+  set(RunCMake_TEST_FAILED "Project file ${csProjectFile} does not exist.")
+  return()
+endif()
+
+set(tagFound FALSE)
+
+set(tagName "MyCustomTag")
+set(tagValue "MyCustomValue")
+
+file(STRINGS "${csProjectFile}" lines)
+foreach(line IN LISTS lines)
+  if(line MATCHES "^ *<${tagName}>${tagValue}")
+message(STATUS "foo.csproj has tag ${tagName} with value ${tagValue} 
defined")
+set(tagFound TRUE)
+  endif()
+endforeach()
+
+if(NOT tagFound)
+  set(RunCMake_TEST_FAILED "Source file tag ${tagName} with value ${tagValue} 
not found.")
+  return()
+endif()
diff --git a/Tests/RunCMake/VS10Project/VsCSharpCustomTags.cmake 
b/Tests/RunCMake/VS10Project/VsCSharpCustomTags.cmake
new file mode 100644
index 000..c51e9c3
--- /dev/null
+++ b/Tests/RunCMake/VS10Project/VsCSharpCustomTags.cmake
@@ -0,0 +1,11 @@
+enable_language(CSharp)
+add_library(foo foo.cs)
+
+set(props_file "${CMAKE_CURRENT_SOURCE_DIR}/my.props")
+
+set(tagName "MyCustomTag")
+set(tagValue "MyCustomValue")
+
+set_source_files_properties(foo.cs
+  PROPERTIES
+  VS_CSHARP_${tagName} "${tagValue}")
diff --git a/Tests/RunCMake/VS10Project/foo.cs 
b/Tests/RunCMake/VS10Project/foo.cs
new file mode 100644
index 000..3695dc9
--- /dev/null
+++ b/Tests/RunCMake/VS10Project/foo.cs
@@ -0,0 +1,3 @@
+void foo()
+{
+}

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff741a77cdc6f777ca16a81a0929b82008e3e9a1
commit ff741a77cdc6f777ca16a81a0929b82008e3e9a1
Author: Michael Stürmer 
AuthorDate: Thu Feb 23 16:49:37 2017 +0100
Commit: Brad King 
CommitDate: Wed Mar 1 09:08:11 2017 -0500

VS: add CSharpUtilities module

diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst
index d4712ba..c478a1b 100644
--- a/Help/manual/cmake-modules.7.rst
+++

[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-677-ge575ac5

2017-03-01 Thread Brad King 
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  e575ac5dbe5032d5df2f89aebd2a910cdfa80b32 (commit)
   via  47b7641c0bdb6a89dd4f89279270ed888001fb32 (commit)
  from  fb13f14f1323f157a519faee26eb8e8c17141f4b (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=e575ac5dbe5032d5df2f89aebd2a910cdfa80b32
commit e575ac5dbe5032d5df2f89aebd2a910cdfa80b32
Merge: fb13f14 47b7641
Author: Brad King 
AuthorDate: Wed Mar 1 09:09:18 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Mar 1 09:09:18 2017 -0500

Merge topic 'csproj_add_free_source_tags' into next

47b7641c Revert topic 'csproj_add_free_source_tags'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=47b7641c0bdb6a89dd4f89279270ed888001fb32
commit 47b7641c0bdb6a89dd4f89279270ed888001fb32
Author: Brad King 
AuthorDate: Wed Mar 1 09:08:54 2017 -0500
Commit: Brad King 
CommitDate: Wed Mar 1 09:08:54 2017 -0500

Revert topic 'csproj_add_free_source_tags'

It will be revised and restored.

diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst
index 5e96d79..2dd56c7 100644
--- a/Help/manual/cmake-modules.7.rst
+++ b/Help/manual/cmake-modules.7.rst
@@ -66,7 +66,6 @@ All Modules
/module/CPackRPM
/module/CPack
/module/CPackWIX
-   /module/CSharpUtilities
/module/CTest
/module/CTestCoverageCollectGCOV
/module/CTestScriptMode
diff --git a/Help/manual/cmake-properties.7.rst 
b/Help/manual/cmake-properties.7.rst
index ac21d48..5fad10c 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -367,7 +367,6 @@ Properties on Source Files
/prop_sf/SKIP_AUTOUIC
/prop_sf/SYMBOLIC
/prop_sf/VS_COPY_TO_OUT_DIR
-   /prop_sf/VS_CSHARP_tagname
/prop_sf/VS_DEPLOYMENT_CONTENT
/prop_sf/VS_DEPLOYMENT_LOCATION
/prop_sf/VS_INCLUDE_IN_VSIX
diff --git a/Help/module/CSharpUtilities.rst b/Help/module/CSharpUtilities.rst
deleted file mode 100644
index 3621bbc..000
--- a/Help/module/CSharpUtilities.rst
+++ /dev/null
@@ -1 +0,0 @@
-.. cmake-module:: ../../Modules/CSharpUtilities.cmake
diff --git a/Help/prop_sf/VS_CSHARP_tagname.rst 
b/Help/prop_sf/VS_CSHARP_tagname.rst
deleted file mode 100644
index d42159f..000
--- a/Help/prop_sf/VS_CSHARP_tagname.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-VS_CSHARP_

-
-Visual Studio and CSharp source-file-specific configuration.
-
-Tell the Visual Studio generator to set the source file tag
- to a given value in the generated Visual Studio CSharp
-project. Ignored on other generators and languages. This property
-can be used to define dependencies between source files or set any
-other Visual Studio specific parameters.
-
-Example usage:
-
-.. code-block:: cmake
-
-  set_source_files_property(
-   PROPERTIES
-   VS_CSHARP_DependentUpon 
-   VS_CSHARP_SubType "Form")
diff --git a/Help/release/dev/CSharpUtilities.rst 
b/Help/release/dev/CSharpUtilities.rst
deleted file mode 100644
index e33bd88..000
--- a/Help/release/dev/CSharpUtilities.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-CSharpUtilities

-
-* A new :module:`CSharpUtilities` module was added to make parameterization
-  of Visual Studio CSharp targets easier and more flexible. Provided functions
-  allow automated setting of source file properties to support Windows Forms,
-  WPF/XAML or other technologies as needed.
diff --git a/Help/release/dev/VS_CSHARP_tagname.rst 
b/Help/release/dev/VS_CSHARP_tagname.rst
deleted file mode 100644
index 3fce83d..000
--- a/Help/release/dev/VS_CSHARP_tagname.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-VS_CSHARP_

-
-* :ref:`Visual Studio Generators` for VS 2010 and above learned a
-  new :prop_sf:`VS_CSHARP_` source file property to specify
-  custom ``.csproj`` content for source files.
diff --git a/Modules/CSharpUtilities.cmake b/Modules/CSharpUtilities.cmake
deleted file mode 100644
index ddad85a..000
--- a/Modules/CSharpUtilities.cmake
+++ /dev/null
@@ -1,298 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-#[===[.rst:
-CSharpUtilities

-
-Functions to make configuration of CSharp/.NET targets easier.
-
-A collection of CMake utility functions useful for dealing with CSharp
-targets for Visual Studio generators from version 2010 and later.
-
-The following

[Cmake-commits] CMake branch, master, updated. v3.8.0-rc1-353-g86563cf

2017-03-01 Thread Brad King 
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  86563cf7c8e6dd4fa98a35b9153e4108e8a2286f (commit)
   via  85e08370d0774397f42a7d45d07f22b3a817fe10 (commit)
  from  4fc64ce76d9981674ababaa3279952544ba8ac01 (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=86563cf7c8e6dd4fa98a35b9153e4108e8a2286f
commit 86563cf7c8e6dd4fa98a35b9153e4108e8a2286f
Merge: 4fc64ce 85e0837
Author: Brad King 
AuthorDate: Wed Mar 1 09:00:43 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Mar 1 09:00:43 2017 -0500

Merge topic 'export-executable-symbols'

85e08370 bindexplib: Always export executable symbols, even they are also 
readable


---

Summary of changes:
 Source/bindexplib.cxx |3 ++-
 Tests/RunCMake/AutoExportDll/AutoExport.cmake |6 ++
 Tests/RunCMake/AutoExportDll/nop.asm  |   12 
 Tests/RunCMake/AutoExportDll/say.cxx  |4 
 4 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 Tests/RunCMake/AutoExportDll/nop.asm


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.8.0-rc1-670-g62305ad

2017-03-01 Thread Brad King 
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  62305adb00f39a06dddcaf44efb09dd0830a66dd (commit)
   via  f782b31368059ce17aee9758de5709ffa43841bf (commit)
   via  86563cf7c8e6dd4fa98a35b9153e4108e8a2286f (commit)
   via  4fc64ce76d9981674ababaa3279952544ba8ac01 (commit)
   via  a9113ae37bae72ee2f7a765da732f2b21d1491ce (commit)
   via  e9cfe63dfca48688064b56777508ab20c5f2aed4 (commit)
  from  edf45878ed265bf1678b3fbb5b977085b048ac89 (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=62305adb00f39a06dddcaf44efb09dd0830a66dd
commit 62305adb00f39a06dddcaf44efb09dd0830a66dd
Merge: edf4587 f782b31
Author: Brad King 
AuthorDate: Wed Mar 1 09:00:53 2017 -0500
Commit: Brad King 
CommitDate: Wed Mar 1 09:00:53 2017 -0500

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, next, updated. v3.8.0-rc1-654-g7f38595

2017-03-01 Thread Gregor Jasny via Cmake-commits 
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  7f38595c96edc9059776b1e8fe3b409f1082b45a (commit)
   via  54a48c6781dd02f2ebbdb19a77c9a4fb59e67735 (commit)
   via  f4977d056b2295679ce723c639f16823cfe489d5 (commit)
   via  7202db5db46bfe7499244af315249820e883c8cf (commit)
   via  5995082101a1959f303f9f3d6c0a1e483630749e (commit)
   via  6a54d28e44c3e539a0f6b45a5bdd748df5ef29ca (commit)
  from  0412b809f4d426ad1826c10e7f4b2d172906b0ee (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=7f38595c96edc9059776b1e8fe3b409f1082b45a
commit 7f38595c96edc9059776b1e8fe3b409f1082b45a
Merge: 0412b80 54a48c6
Author: Gregor Jasny 
AuthorDate: Wed Mar 1 05:13:29 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Mar 1 05:13:29 2017 -0500

Merge topic 'xcode-enhance-schemes' into next

54a48c67 Xcode: Use proper buildable name for schema
f4977d05 Xcode: Select executable target for execution in schema
7202db5d Xcode: Fix schema container location calculation
59950821 Xcode: Do not autocreate schemes
6a54d28e Xcode: Use proper indentation for schemes


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54a48c6781dd02f2ebbdb19a77c9a4fb59e67735
commit 54a48c6781dd02f2ebbdb19a77c9a4fb59e67735
Author: Gregor Jasny 
AuthorDate: Sat Feb 25 21:26:17 2017 +0100
Commit: Gregor Jasny 
CommitDate: Tue Feb 28 22:38:30 2017 +0100

Xcode: Use proper buildable name for schema

diff --git a/Source/cmXCodeScheme.cxx b/Source/cmXCodeScheme.cxx
index 1596e5c..5c22531 100644
--- a/Source/cmXCodeScheme.cxx
+++ b/Source/cmXCodeScheme.cxx
@@ -15,6 +15,7 @@ cmXCodeScheme::cmXCodeScheme(cmXCodeObject* xcObj,
  unsigned int xcVersion)
   : Target(xcObj)
   , TargetName(xcObj->GetTarget()->GetName())
+  , BuildableName(xcObj->GetTarget()->GetFullName())
   , TargetId(xcObj->GetId())
   , ConfigList(configList)
   , XcodeVersion(xcVersion)
@@ -87,7 +88,7 @@ void cmXCodeScheme::WriteBuildAction(cmXMLWriter& xout,
   xout.BreakAttributes();
   xout.Attribute("BuildableIdentifier", "primary");
   xout.Attribute("BlueprintIdentifier", this->TargetId);
-  xout.Attribute("BuildableName", this->TargetName);
+  xout.Attribute("BuildableName", this->BuildableName);
   xout.Attribute("BlueprintName", this->TargetName);
   xout.Attribute("ReferencedContainer", "container:" + container);
   xout.EndElement();
@@ -149,7 +150,7 @@ void cmXCodeScheme::WriteLaunchAction(cmXMLWriter& xout,
   xout.BreakAttributes();
   xout.Attribute("BuildableIdentifier", "primary");
   xout.Attribute("BlueprintIdentifier", this->TargetId);
-  xout.Attribute("BuildableName", this->TargetName);
+  xout.Attribute("BuildableName", this->BuildableName);
   xout.Attribute("BlueprintName", this->TargetName);
   xout.Attribute("ReferencedContainer", "container:" + container);
   xout.EndElement();
diff --git a/Source/cmXCodeScheme.h b/Source/cmXCodeScheme.h
index 470b5fd..0a8e737 100644
--- a/Source/cmXCodeScheme.h
+++ b/Source/cmXCodeScheme.h
@@ -26,6 +26,7 @@ public:
 private:
   const cmXCodeObject* const Target;
   const std::string& TargetName;
+  const std::string BuildableName;
   const std::string& TargetId;
   const std::vector& ConfigList;
   const unsigned int XcodeVersion;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f4977d056b2295679ce723c639f16823cfe489d5
commit f4977d056b2295679ce723c639f16823cfe489d5
Author: Gregor Jasny 
AuthorDate: Fri Feb 24 18:47:58 2017 +0100
Commit: Gregor Jasny 
CommitDate: Tue Feb 28 22:38:29 2017 +0100

Xcode: Select executable target for execution in schema

diff --git a/Source/cmXCodeScheme.cxx b/Source/cmXCodeScheme.cxx
index e5031fd..1596e5c 100644
--- a/Source/cmXCodeScheme.cxx
+++ b/Source/cmXCodeScheme.cxx
@@ -13,7 +13,8 @@
 cmXCodeScheme::cmXCodeScheme(cmXCodeObject* xcObj,
  const std::vector& configList,
  unsigned int xcVersion)
-  : TargetName(xcObj->GetTarget()->GetName())
+  : Target(xcObj)
+  , TargetName(xcObj->GetTarget()->GetName())
   , TargetId(xcObj->GetId())
   , ConfigList(configList)
   , XcodeVersion(xcVersion)
@@ -135,7 +136,14 @@ void cmXCodeScheme::WriteLaunchAction(cmXMLWriter& xout,
   xout.Attribute("debugServiceExtension", "internal");
   xout.Attribute("allowLocationSimulation", "YES");
 
-  xout.StartElement("MacroExpansion");
+  if (IsExecutable(this->Target)) {
+