Re-organization of Additional Features manual by John Hudson.

[lyx.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 68845e3f346685eaf14700f90028f3d8738fcacc..cf0e708554281b00ac2930df98f2f8802dfd6ff5 100644 (file)
--- 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)
@@ -272,8 +274,8 @@ if(UNIX OR MINGW)
          execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
          message(STATUS "Using GCC version ${GCC_VERSION}")
          if(GCC_VERSION VERSION_LESS 4.9)
-                 if(GCC_VERSION VERSION_LESS 4.3)
-                         message(FATAL_ERROR "gcc >= 4.3 is required.")
+                 if(GCC_VERSION VERSION_LESS 4.6)
+                         message(FATAL_ERROR "gcc >= 4.6 is required.")
                  endif()
                  # <regex> in gcc is unusable in versions less than 4.9.0
                  # see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631