From 81701e1dc84a1a3ebe1087db535734e690c550ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20K=C3=BCmmel?= Date: Mon, 5 Dec 2011 20:09:50 +0000 Subject: [PATCH] cmake: make it possible to overwrite default settings git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40382 a592a061-630c-0410-9148-cb99ea01b6c8 --- CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f03c5cab2c..bdf7ae0aad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -100,7 +100,7 @@ LYX_OPTION(CONCEPT_CHECKS "Enable concept-checks" OFF GCC) LYX_OPTION(PROFILE "Build with options for gprof" OFF GCC) # MSVC specific -LYX_OPTION(CONSOLE "Show console on Windows" ON MSVC) +LYX_OPTION(CONSOLE "Show console on Windows, enforce with =FORCE" 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) @@ -136,7 +136,11 @@ if(LYX_INSTALL) if (WIN32) set(LYX_HUNSPELL ON) endif() - set(LYX_CONSOLE OFF) + if(LYX_CONSOLE MATCHES "FORCE") + set(LYX_CONSOLE ON) + else() + set(LYX_CONSOLE OFF) + endif() set(LYX_PACKAGE_SUFFIX ON) set(LYX_RELEASE ON) set(LYX_PROFILE OFF)