[Cmake-commits] CMake branch, next, updated. v3.7.1-1765-g6df91bf

[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  6df91bf6f7f3d9cce662606889585ad41eb85cba (commit)
       via  e5af11d4d1daa7079c2635700fbcd50f0cb3ac01 (commit)
      from  5d67e5457f9eac7cd1be20f11b4a2331d7b56337 (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=6df91bf6f7f3d9cce662606889585ad41eb85cba
commit 6df91bf6f7f3d9cce662606889585ad41eb85cba
Merge: 5d67e54 e5af11d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 15 09:16:19 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 15 09:16:19 2016 -0500

    Merge topic 'csharp_support_compiler_detection' into next
    
    e5af11d4 VS: fixing C# compiler detection.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e5af11d4d1daa7079c2635700fbcd50f0cb3ac01
commit e5af11d4d1daa7079c2635700fbcd50f0cb3ac01
Author:     Michael Stürmer <michael.stuermer at schaeffler.com>
AuthorDate: Thu Dec 15 09:38:20 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Dec 15 09:16:02 2016 -0500

    VS: fixing C# compiler detection.
    
    On some systems the Microsoft.Common.props file was not found, so it was
    removed from the VS-10.csproj.in

diff --git a/Modules/CMakeDetermineCSharpCompiler.cmake b/Modules/CMakeDetermineCSharpCompiler.cmake
index fbe2f38..1b8dd02 100644
--- a/Modules/CMakeDetermineCSharpCompiler.cmake
+++ b/Modules/CMakeDetermineCSharpCompiler.cmake
@@ -23,8 +23,8 @@ if(NOT CMAKE_CSharp_COMPILER_ID_RUN)
   include(${CMAKE_ROOT}/Modules/CMakeDetermineCompilerId.cmake)
   CMAKE_DETERMINE_COMPILER_ID(CSharp CSFLAGS CMakeCSharpCompilerId.cs)
 
-  execute_process(COMMAND ${CMAKE_CSharp_COMPILER} "/help" OUTPUT_VARIABLE output)
-  string(REPLACE "\n" ";" output ${output})
+  execute_process(COMMAND "${CMAKE_CSharp_COMPILER}" "/help" OUTPUT_VARIABLE output)
+  string(REPLACE "\n" ";" output "${output}")
   foreach(line ${output})
     string(TOUPPER ${line} line)
     string(REGEX REPLACE "^.*COMPILER.*VERSION[^\\.0-9]*([\\.0-9]+).*$" "\\1" version "${line}")
diff --git a/Modules/CompilerId/VS-10.csproj.in b/Modules/CompilerId/VS-10.csproj.in
index 7fea724..833dca7 100644
--- a/Modules/CompilerId/VS-10.csproj.in
+++ b/Modules/CompilerId/VS-10.csproj.in
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|@id_platform@">
-      <Configuration>Debug</Configuration>
-      <Platform>@id_platform@</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{CAE07175-D007-4FC3-BFE8-47B392814159}</ProjectGuid>
     <RootNamespace>CompilerId at id_lang@</RootNamespace>
@@ -15,7 +9,6 @@
     @id_WindowsTargetPlatformVersion@
     @id_WindowsSDKDesktopARMSupport@
   </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     @id_PreferredToolArchitecture@
   </PropertyGroup>
@@ -54,8 +47,6 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
     <PostBuildEvent>cd /D "$(MSBuildToolsPath)"
 if not %errorlevel%==0 exit -1
 if not exist @id_cl@ exit -2

-----------------------------------------------------------------------

Summary of changes:
 Modules/CMakeDetermineCSharpCompiler.cmake |    4 ++--
 Modules/CompilerId/VS-10.csproj.in         |    9 ---------
 2 files changed, 2 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake