[Cmake-commits] CMake branch, next, updated. v3.7.2-2409-ge715efb

[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  e715efbedea5ef980aee816f6a398ce8752e5877 (commit)
       via  ced346efc67dbfa23f76cb13622485d07c8e9f5f (commit)
      from  6d2ebf57d7ad7e9772ef2cbc2321329b03e50770 (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=e715efbedea5ef980aee816f6a398ce8752e5877
commit e715efbedea5ef980aee816f6a398ce8752e5877
Merge: 6d2ebf5 ced346e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 30 09:04:36 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 30 09:04:36 2017 -0500

    Merge topic 'CSharpVS2017' into next
    
    ced346ef Fix CSharp compiler identification for VS 2017


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ced346efc67dbfa23f76cb13622485d07c8e9f5f
commit ced346efc67dbfa23f76cb13622485d07c8e9f5f
Author:     Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Fri Jan 27 13:50:17 2017 -0800
Commit:     Gilles Khouzam <gillesk at microsoft.com>
CommitDate: Fri Jan 27 14:05:27 2017 -0800

    Fix CSharp compiler identification for VS 2017
    
    The CSharp compiler for VS2017 has moved from MSBuildTools to RoslynTargets
    this change accounts for both locations giving priority to the MSBuildTools location

diff --git a/Modules/CompilerId/VS-10.csproj.in b/Modules/CompilerId/VS-10.csproj.in
index 833dca7..2bd179e 100644
--- a/Modules/CompilerId/VS-10.csproj.in
+++ b/Modules/CompilerId/VS-10.csproj.in
@@ -47,9 +47,9 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>cd /D "$(MSBuildToolsPath)"
-if not %errorlevel%==0 exit -1
-if not exist @id_cl@ exit -2
-%40echo CMAKE_ at id_lang@_COMPILER=$(MSBuildToolsPath)\@id_cl@</PostBuildEvent>
+    <PostBuildEvent>if not "$(RoslynTargetsPath)"=="" if exist "$(RoslynTargetsPath)\@id_cl@" set _CSC=$(RoslynTargetsPath)
+if exist "$(MSBuildToolsPath)\@id_cl@" set _CSC=$(MSBuildToolsPath)
+if "_CSC"=="" exit -1
+%40echo CMAKE_ at id_lang@_COMPILER=%_CSC%\@id_cl@</PostBuildEvent>
   </PropertyGroup>
 </Project>

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

Summary of changes:
 Modules/CompilerId/VS-10.csproj.in |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake