Author: kuemmel
Date: Mon Dec 5 21:09:50 2011
New Revision: 40382
URL: http://www.lyx.org/trac/changeset/40382
Log:
cmake: make it possible to overwrite default settings
Modified:
lyx-devel/trunk/CMakeLists.txt
Modified: lyx-devel/trunk/CMakeLists.txt
==============================================================================
--- lyx-devel/trunk/CMakeLists.txt Mon Dec 5 20:37:44 2011 (r40381)
+++ lyx-devel/trunk/CMakeLists.txt Mon Dec 5 21:09:50 2011 (r40382)
@@ -100,7 +100,7 @@
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 (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)
