[Cmake-commits] CMake branch, next, updated. v3.7.2-2439-g6f89974

[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  6f899744ad89c07185b4ab89c0d14f5289369ea4 (commit)
       via  435cebaaa1663274cbe43c19cb8244011b6d1384 (commit)
      from  7d4c722add9f1e799fc278d164fa4fb0916f3aa4 (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=6f899744ad89c07185b4ab89c0d14f5289369ea4
commit 6f899744ad89c07185b4ab89c0d14f5289369ea4
Merge: 7d4c722 435ceba
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 31 09:01:54 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 31 09:01:54 2017 -0500

    Merge topic 'CSharpVS2017' into next
    
    435cebaa VS: Fix CSharp compiler identification for VS 2017


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=435cebaaa1663274cbe43c19cb8244011b6d1384
commit 435cebaaa1663274cbe43c19cb8244011b6d1384
Author:     Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Fri Jan 27 13:50:17 2017 -0800
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 31 09:00:20 2017 -0500

    VS: Fix CSharp compiler identification for VS 2017
    
    The CSharp compiler for VS 2017 has moved from `MSBuildTools` to
    `RoslynTargets`.  Account 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..ed5e847 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:


hooks/post-receive
-- 
CMake