From 48fd76d4bfb99ee9dff20740c6b46683e36f043e Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Sun, 19 Jun 2016 12:47:30 +0200 Subject: [PATCH] Fix windows dependencies download The paths and servers have changed, and a MSVC 2013 version is not provided anymore. --- CMakeLists.txt | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bb715998a5..cf0e708554 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -210,17 +210,19 @@ endif() if(LYX_DEPENDENCIES_DOWNLOAD) message(STATUS) - if(MSVC12) - set(LYX_DEPENDENCIES_DIR ${TOP_BINARY_DIR}/msvc2013-deps) - set(deps_files lyx-windows-deps-msvc2013.zip) - set(deps_server http://ftp.lyx.de/LyX-Windows-Deps) - set(GNUWIN32_DIR ${LYX_DEPENDENCIES_DIR}/lyx-windows-deps-msvc2013) - else() - set(LYX_DEPENDENCIES_DIR ${TOP_BINARY_DIR}/msvc2010-deps) - set(deps_files lyx20-deps-msvc2010-x86.zip) - set(deps_server http://downloads.sourceforge.net/project/lyx/Win_installers/Dependencies) - set(GNUWIN32_DIR ${LYX_DEPENDENCIES_DIR}/deps20) - endif() + if(MSVC14) + set(LYX_DEPENDENCIES_DIR ${TOP_BINARY_DIR}/msvc2015-deps) + set(deps_files lyx-windows-deps-msvc2015.zip) + set(deps_server http://ftp.lyx.de/LyX-Windows-Deps) + set(GNUWIN32_DIR ${LYX_DEPENDENCIES_DIR}/lyx-windows-deps-msvc2015) + elseif(MSVC10) + set(LYX_DEPENDENCIES_DIR ${TOP_BINARY_DIR}/msvc2010-deps) + set(deps_files lyx-windows-deps-msvc2010.zip) + set(deps_server http://ftp.lyx.de/LyX-Windows-Deps) + set(GNUWIN32_DIR ${LYX_DEPENDENCIES_DIR}/lyx-windows-deps-msvc2010) + else() + message(FATAL_ERROR "error: no dependency package known for the selected MSVC version.") + endif() message(STATUS "Using downloaded dependencies in ${LYX_DEPENDENCIES_DIR}") foreach(it ${deps_files}) set(already_downloaded already_downloaded-NOTFOUND CACHE PATH "downloaded" FORCE)