From ef1444b8df264071ee1b2a6aa58c5cee2972e6db Mon Sep 17 00:00:00 2001 From: =?utf8?q?Peter=20K=C3=BCmmel?= Date: Tue, 15 Feb 2011 09:46:14 +0000 Subject: [PATCH] cmake: complete renaming of LYX_3RDPARTY_DOWNLOAD git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37675 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/cmake/CMakeLists.txt | 5 ++--- development/cmake/modules/FindGNUWIN32.cmake | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt index d0f8a3861c..35ea1e731d 100644 --- a/development/cmake/CMakeLists.txt +++ b/development/cmake/CMakeLists.txt @@ -67,7 +67,7 @@ LYX_OPTION(CONSOLE "Show console on Windows" ON MSVC) LYX_OPTION(VLD "Use VLD with MSVC" OFF MSVC) LYX_OPTION(WALL "Enable all warnings" 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 if(LYX_CPACK) @@ -95,8 +95,7 @@ if(LYX_DEPENDENCIES_DOWNLOAD) message(STATUS) set(LYX_DEPENDENCIES_DIR ${CMAKE_BINARY_DIR}/msvc2010-deps) message(STATUS "Using downloaded dependencies in ${LYX_DEPENDENCIES_DIR}") - set(deps_files - lyx20-deps-msvc2010-x86.zip) + set(deps_files lyx20-deps-msvc2010-x86.zip) foreach(it ${deps_files}) set(already_downloaded already_downloaded-NOTFOUND CACHE PATH "downloaded" FORCE) find_file(already_downloaded ${it} "${LYX_DEPENDENCIES_DIR}/download") diff --git a/development/cmake/modules/FindGNUWIN32.cmake b/development/cmake/modules/FindGNUWIN32.cmake index ea3ab25e98..93afaef750 100644 --- a/development/cmake/modules/FindGNUWIN32.cmake +++ b/development/cmake/modules/FindGNUWIN32.cmake @@ -39,7 +39,7 @@ if(WIN32) if (GNUWIN32_FIND_REQUIRED) set(GNUWIN32_DIR CACHE PATH FORCE) 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) endif() endif() -- 2.39.2