]> git.lyx.org Git - features.git/commitdiff
cmake: make it possible to overwrite default settings
authorPeter Kümmel <syntheticpp@gmx.net>
Mon, 5 Dec 2011 20:09:50 +0000 (20:09 +0000)
committerPeter Kümmel <syntheticpp@gmx.net>
Mon, 5 Dec 2011 20:09:50 +0000 (20:09 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40382 a592a061-630c-0410-9148-cb99ea01b6c8

CMakeLists.txt

index f03c5cab2cf2b5ccd75b23d1a2f5df2a34522bcb..bdf7ae0aad131a273572ae3bf1eb75663c32bc92 100644 (file)
@@ -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)