From 7eec53647332f5c4c55acdbeaafa404676e309d6 Mon Sep 17 00:00:00 2001 From: Paul Thomson Date: Fri, 7 Apr 2017 20:15:29 +0100 Subject: [PATCH] Fix Windows ci. --- CMakeLists.txt | 6 +++--- buildscripts/1-install-deps-appveyor.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2300f64..ac2b248 100644 --- 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 index 61f3d93..abfa745 100755 --- 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