Fix Windows ci.

mc-imperial · Apr 7, 2017 · 7eec536 · 7eec536
1 parent 56f32ed
commit 7eec536
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,9 +3,9 @@ cmake_minimum_required(VERSION 2.8)
 project(cpp)
 
 # Add "deps" to search prefix for convenience.
-set(CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR}/deps ${CMAKE_SOURCE_DIR}/deps ${CMAKE_PREFIX_PATH})
-
-message(STATUS ${CMAKE_PREFIX_PATH})
+set(CMAKE_PREFIX_PATH "${CMAKE_BINARY_DIR}/deps" "${CMAKE_SOURCE_DIR}/deps" "${CMAKE_PREFIX_PATH}")
+# The libraries have the "lib" prefix even on Windows.
+set(CMAKE_FIND_LIBRARY_PREFIXES "lib" "${CMAKE_FIND_LIBRARY_PREFIXES}")
 
 # Set rpath for Mac and Linux.
 if(APPLE)

diff --git a/buildscripts/1-install-deps-appveyor.sh b/buildscripts/1-install-deps-appveyor.sh
@@ -14,6 +14,6 @@ cd ..
 
 mkdir deps
 cd deps
-curl -fsSL -o angle.zip https://github.com/paulthomson/build-angle/releases/download/v-6d5336347c750def8c0447d055a7368262431508/MSVC2015-Release-x64.zip
+curl -fsSL -o angle.zip https://github.com/paulthomson/build-angle/releases/download/v-592879ad24e66c7c68c3a06d4e2227630520da36/MSVC2015-Release-x64.zip
 7z x angle.zip