From 4cc5d0825dea0a5693b082eb7adbaa44920fc903 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20K=C3=BCmmel?= Date: Fri, 20 Oct 2006 12:46:30 +0000 Subject: [PATCH] cmake: don't forget command line options git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15403 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/cmake/CMakeLists.txt | 3 ++- development/cmake/modules/FindGNUWIN32.cmake | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt index 5764539694..3b03c8f525 100644 --- a/development/cmake/CMakeLists.txt +++ b/development/cmake/CMakeLists.txt @@ -57,7 +57,6 @@ else(qt3) set(qt_postfix qt4) project(lyx-${qt_postfix}) find_package(Qt4 REQUIRED) - endif(qt3) find_package(ZLIB REQUIRED) @@ -65,6 +64,7 @@ find_package(ICONV REQUIRED) add_definitions(-DHAVE_ICONV=1) if(all OR aspell) + set(aspell TRUE CACHE TYPE STRING) find_package(ASPELL REQUIRED) else(all OR aspell) find_package(ASPELL) @@ -73,6 +73,7 @@ set(aspell) message("") if(nls OR all) + set(nls TRUE CACHE TYPE STRING) add_definitions(-DENABLE_NLS=1) message("----- Building with ENABLE_NLS") else(nls OR all) diff --git a/development/cmake/modules/FindGNUWIN32.cmake b/development/cmake/modules/FindGNUWIN32.cmake index b5900ac0f5..a7c04a4038 100644 --- a/development/cmake/modules/FindGNUWIN32.cmake +++ b/development/cmake/modules/FindGNUWIN32.cmake @@ -19,6 +19,8 @@ if(NOT GNUWIN32_DIR) ) set(GNUWIN32_DIR ${GNUWIN32_DIR_tmp}) endif(NOT GNUWIN32_DIR) +else(NOT GNUWIN32_DIR) + SET(GNUWIN32_DIR ${GNUWIN32_DIR} CACHE TYPE STRING) endif(NOT GNUWIN32_DIR) if (GNUWIN32_DIR)