anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake: complete renaming of LYX_3RDPARTY_DOWNLOAD

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37675 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2011-02-15 09:46:14 +00:00
parent ed4bebf698
commit ef1444b8df
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
development/cmake/CMakeLists.txt
View File

@ -67,7 +67,7 @@ LYX_OPTION(CONSOLE "Show console on Windows" ON MSVC)
LYX_OPTION(VLD "Use VLD with MSVC" OFF MSVC) LYX_OPTION(VLD "Use VLD with MSVC" OFF MSVC)
LYX_OPTION(WALL "Enable all warnings" OFF MSVC) LYX_OPTION(WALL "Enable all warnings" OFF MSVC)
LYX_OPTION(CONFIGURE_CHECKS "Also run configure checks for MSVC" OFF MSVC) LYX_OPTION(CONFIGURE_CHECKS "Also run configure checks for MSVC" OFF MSVC)
LYX_OPTION(3RDPARTY_DOWNLOAD "Download precompiled 3rd party libraries for MSVC 10" OFF MSVC) LYX_OPTION(DEPENDENCIES_DOWNLOAD "Download dependencies for MSVC 10" OFF MSVC)
# Check option dependencies # Check option dependencies
if(LYX_CPACK) if(LYX_CPACK)
@ -95,8 +95,7 @@ if(LYX_DEPENDENCIES_DOWNLOAD)
message(STATUS) message(STATUS)
set(LYX_DEPENDENCIES_DIR ${CMAKE_BINARY_DIR}/msvc2010-deps) set(LYX_DEPENDENCIES_DIR ${CMAKE_BINARY_DIR}/msvc2010-deps)
message(STATUS "Using downloaded dependencies in ${LYX_DEPENDENCIES_DIR}") message(STATUS "Using downloaded dependencies in ${LYX_DEPENDENCIES_DIR}")
set(deps_files set(deps_files lyx20-deps-msvc2010-x86.zip)
lyx20-deps-msvc2010-x86.zip)
foreach(it ${deps_files}) foreach(it ${deps_files})
set(already_downloaded already_downloaded-NOTFOUND CACHE PATH "downloaded" FORCE) set(already_downloaded already_downloaded-NOTFOUND CACHE PATH "downloaded" FORCE)
find_file(already_downloaded ${it} "${LYX_DEPENDENCIES_DIR}/download") find_file(already_downloaded ${it} "${LYX_DEPENDENCIES_DIR}/download")

2
development/cmake/modules/FindGNUWIN32.cmake
View File

@ -39,7 +39,7 @@ if(WIN32)
if (GNUWIN32_FIND_REQUIRED) if (GNUWIN32_FIND_REQUIRED)
set(GNUWIN32_DIR CACHE PATH FORCE) set(GNUWIN32_DIR CACHE PATH FORCE)
message(STATUS "ERROR: Could NOT find GNUWIN32, please set GNUWIN32_DIR") message(STATUS "ERROR: Could NOT find GNUWIN32, please set GNUWIN32_DIR")
message(STATUS "ERROR: or let cmake download all required files by using -DLYX_3RDPARTY_DOWNLOAD=1") message(STATUS "ERROR: or let cmake download all required files by using -DLYX_DEPENDENCIES_DOWNLOAD=1")
message(FATAL_ERROR) message(FATAL_ERROR)
endif() endif()
endif() endif()