[Cmake-commits] CMake branch, master, updated. v3.10.0-rc4-241-ga7347c0

[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  a7347c022eb67272eea7dca5a58d0b94806b7d95 (commit)
       via  fcb39aaa19360ae9096f2f2567e3afb1630cc370 (commit)
       via  04937db103541da442a426818c9314a423235858 (commit)
       via  6e2193a26dd3e73af41a86f672d84144beb5a3c9 (commit)
       via  e673e6f053f7320f78a2ce9ed262f9c11e503998 (commit)
      from  b5d8610430b844231278db9ca3f807e2c433a608 (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=a7347c022eb67272eea7dca5a58d0b94806b7d95
commit a7347c022eb67272eea7dca5a58d0b94806b7d95
Merge: fcb39aa 04937db
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 7 13:24:29 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Nov 7 08:31:09 2017 -0500

    Merge topic 'csharp-version-english'
    
    04937db1 CSharp: Fix compiler version detection in non-English languages
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1449


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fcb39aaa19360ae9096f2f2567e3afb1630cc370
commit fcb39aaa19360ae9096f2f2567e3afb1630cc370
Merge: b5d8610 6e2193a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 7 13:21:35 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Nov 7 08:25:41 2017 -0500

    Merge topic 'update-CheckFortran'
    
    6e2193a2 Tests: Avoid hanging on check for Fortran
    e673e6f0 Tests: Pass generator instance into check for Fortran
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1454


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=04937db103541da442a426818c9314a423235858
commit 04937db103541da442a426818c9314a423235858
Author:     Yoshinori Tahara <yossi-tahara at theolizer.com>
AuthorDate: Wed Nov 1 20:06:44 2017 +0900
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 7 08:23:16 2017 -0500

    CSharp: Fix compiler version detection in non-English languages
    
    When we run `csc.exe /help` we look for "Version" in the output.
    Explicitly ask for the output in English.
    
    Reported-by: guttally at users.noreply.github.com

diff --git a/Modules/CMakeDetermineCSharpCompiler.cmake b/Modules/CMakeDetermineCSharpCompiler.cmake
index 55b2fb3..eb825a5 100644
--- a/Modules/CMakeDetermineCSharpCompiler.cmake
+++ b/Modules/CMakeDetermineCSharpCompiler.cmake
@@ -23,7 +23,7 @@ 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)
+  execute_process(COMMAND "${CMAKE_CSharp_COMPILER}" "/help /preferreduilang:en-US" OUTPUT_VARIABLE output)
   string(REPLACE "\n" ";" output "${output}")
   foreach(line ${output})
     string(TOUPPER ${line} line)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6e2193a26dd3e73af41a86f672d84144beb5a3c9
commit 6e2193a26dd3e73af41a86f672d84144beb5a3c9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 6 07:50:08 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 6 10:21:11 2017 -0500

    Tests: Avoid hanging on check for Fortran
    
    Use a timeout when running the check for Fortran in case the tools hang.

diff --git a/Tests/CheckFortran.cmake b/Tests/CheckFortran.cmake
index 653f521..16a8ed2 100644
--- a/Tests/CheckFortran.cmake
+++ b/Tests/CheckFortran.cmake
@@ -26,6 +26,7 @@ file(WRITE \"\${CMAKE_CURRENT_BINARY_DIR}/result.cmake\"
                                -A "${CMAKE_GENERATOR_PLATFORM}"
                                -T "${CMAKE_GENERATOR_TOOLSET}"
                                ${_D_CMAKE_GENERATOR_INSTANCE}
+    TIMEOUT 60
     OUTPUT_VARIABLE output
     ERROR_VARIABLE output
     RESULT_VARIABLE result

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e673e6f053f7320f78a2ce9ed262f9c11e503998
commit e673e6f053f7320f78a2ce9ed262f9c11e503998
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 6 07:49:17 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 6 10:21:11 2017 -0500

    Tests: Pass generator instance into check for Fortran
    
    Check for a Fortran compiler using the same VS instance that we are
    testing.

diff --git a/Tests/CheckFortran.cmake b/Tests/CheckFortran.cmake
index b1652ba..653f521 100644
--- a/Tests/CheckFortran.cmake
+++ b/Tests/CheckFortran.cmake
@@ -15,11 +15,17 @@ file(WRITE \"\${CMAKE_CURRENT_BINARY_DIR}/result.cmake\"
   \"set(CMAKE_Fortran_COMPILER_SUPPORTS_F90 \\\"\${CMAKE_Fortran_COMPILER_SUPPORTS_F90}\\\")\\n\"
   )
 ")
+  if(CMAKE_GENERATOR_INSTANCE)
+    set(_D_CMAKE_GENERATOR_INSTANCE "-DCMAKE_GENERATOR_INSTANCE:INTERNAL=${CMAKE_GENERATOR_INSTANCE}")
+  else()
+    set(_D_CMAKE_GENERATOR_INSTANCE "")
+  endif()
   execute_process(
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/CheckFortran
     COMMAND ${CMAKE_COMMAND} . -G ${CMAKE_GENERATOR}
                                -A "${CMAKE_GENERATOR_PLATFORM}"
                                -T "${CMAKE_GENERATOR_TOOLSET}"
+                               ${_D_CMAKE_GENERATOR_INSTANCE}
     OUTPUT_VARIABLE output
     ERROR_VARIABLE output
     RESULT_VARIABLE result

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

Summary of changes:
 Modules/CMakeDetermineCSharpCompiler.cmake |    2 +-
 Tests/CheckFortran.cmake                   |    7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake