anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-19 14:30:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

now we have MSVC13 3rdparty binaries

Browse Source
This commit is contained in:
Peter Kümmel 2015-12-09 16:44:42 +01:00
parent 8028110578
commit d3092fc355
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
CMakeLists.txt
View File

@ -208,10 +208,18 @@ endif()
if(LYX_DEPENDENCIES_DOWNLOAD)
message(STATUS)
set(LYX_DEPENDENCIES_DIR ${TOP_BINARY_DIR}/msvc2010-deps)
message(STATUS "Using downloaded dependencies in ${LYX_DEPENDENCIES_DIR}")
set(deps_files lyx20-deps-msvc2010-x86.zip)
set(deps_server http://downloads.sourceforge.net/project/lyx/Win_installers/Dependencies)
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()
message(STATUS "Using downloaded dependencies in ${LYX_DEPENDENCIES_DIR}")
foreach(it ${deps_files})
set(already_downloaded already_downloaded-NOTFOUND CACHE PATH "downloaded" FORCE)
find_file(already_downloaded ${it} "${LYX_DEPENDENCIES_DIR}/download")
@ -228,11 +236,6 @@ if(LYX_DEPENDENCIES_DOWNLOAD)
WORKING_DIRECTORY ${LYX_DEPENDENCIES_DIR})
endif()
endforeach()
set(GNUWIN32_DIR ${LYX_DEPENDENCIES_DIR}/deps20)
if(MSVC12)
# handle error in msvc12 when linking against msvc10 libs
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /vd2")
endif()
endif()