From be5e529bb3e8483e5675488232d936e7d7d29ceb Mon Sep 17 00:00:00 2001
From: Albert Ziegenhagel <albert.ziegenhagel@scai.fraunhofer.de>
Date: Wed, 3 Jan 2018 10:57:46 +0100
Subject: Update cmake to 3.10.1

---
 scripts/fetchDependency.ps1 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'scripts')

diff --git a/scripts/fetchDependency.ps1 b/scripts/fetchDependency.ps1
index f62fe450c..168c2359e 100644
--- a/scripts/fetchDependency.ps1
+++ b/scripts/fetchDependency.ps1
@@ -20,12 +20,12 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency)
 
     if($Dependency -eq "cmake")
     {
-        $requiredVersion = "3.10.0"
-        $downloadVersion = "3.10.0"
-        $url = "https://cmake.org/files/v3.10/cmake-3.10.0-win32-x86.zip"
-        $downloadPath = "$downloadsDir\cmake-3.10.0-win32-x86.zip"
-        $expectedDownloadedFileHash = "dce666e897f95a88d3eed6cddd1faa3f44179d519b33ca6065b385bbc7072419"
-        $executableFromDownload = "$downloadsDir\cmake-3.10.0-win32-x86\bin\cmake.exe"
+        $requiredVersion = "3.10.1"
+        $downloadVersion = "3.10.1"
+        $url = "https://cmake.org/files/v3.10/cmake-3.10.1-win32-x86.zip"
+        $downloadPath = "$downloadsDir\cmake-3.10.1-win32-x86.zip"
+        $expectedDownloadedFileHash = "6fe010cce1201d884cd7a9535db8a1f16d98b8965341251fde8f1c5069ee58c0"
+        $executableFromDownload = "$downloadsDir\cmake-3.10.1-win32-x86\bin\cmake.exe"
         $extractionType = $ExtractionType_ZIP
     }
     elseif($Dependency -eq "nuget")
-- 
cgit v1.2.3


From 43aec468a14993044b9d6fd89d124c1371edba64 Mon Sep 17 00:00:00 2001
From: Albert Ziegenhagel <albert.ziegenhagel@scai.fraunhofer.de>
Date: Wed, 3 Jan 2018 10:58:59 +0100
Subject: Remove workaround for a bug in FindMPI.cmake that was introduced in
 cmake 3.10.0 and fixed in 3.10.1

---
 scripts/buildsystems/vcpkg.cmake | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'scripts')

diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake
index b8d3fbdbb..7ebe695fb 100644
--- a/scripts/buildsystems/vcpkg.cmake
+++ b/scripts/buildsystems/vcpkg.cmake
@@ -207,17 +207,6 @@ macro(find_package name)
             add_library(tinyxml2 INTERFACE IMPORTED)
             set_target_properties(tinyxml2 PROPERTIES INTERFACE_LINK_LIBRARIES "tinyxml2_static")
         endif()
-    elseif("${name}" STREQUAL "MPI")
-        if(MPI_C_LIB_NAMES)
-            set(MPI_C_WORKS TRUE)
-            set(MPI_C_WRAPPER_FOUND TRUE)
-        endif()
-        if(MPI_CXX_LIB_NAMES)
-            set(MPI_CXX_WORKS TRUE)
-            set(MPI_CXX_WRAPPER_FOUND TRUE)
-            set(MPI_CXX_VALIDATE_SKIP_MPICXX TRUE)
-        endif()
-        _find_package(${ARGV})
     else()
         _find_package(${ARGV})
     endif()
-- 
cgit v1.2.3