add option to disable the console on windows

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15916 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt
index 3b6e8ffde6e73d3eae0935426ad8ac358cd1c93f..15b7c5f6283e5fa324ecc1fc7171783557c65873 100644 (file)
--- a/development/cmake/CMakeLists.txt
+++ b/development/cmake/CMakeLists.txt
@@ -67,9 +67,22 @@ if(ASPELL_FOUND)
 else(ASPELL_FOUND)     
        message("----- No aspell, to get more information use -Daspell=1")
 endif(ASPELL_FOUND)
-message("")
 set(all)
 
+if(WIN32)
+       if(noconsole)
+               set(noconsole TRUE CACHE TYPE STRING)
+               set(WIN32_CONSOLE WIN32)
+               set(LYX_QTMAIN_LIBRARY ${QT_QTMAIN_LIBRARY})
+               message("----- Console disabled")
+       else(noconsole)
+               message("----- Console enabled, disable it with -Dnoconsole=1")
+       endif(noconsole)
+endif(WIN32)
+
+message("")
+
+
 # create config.h
 include(ConfigureChecks.cmake)
 configure_file(config.h.cmake ${CMAKE_BINARY_DIR}/config.h )
@@ -90,7 +103,7 @@ if(MSVC)
 else(MSVC)
        add_definitions(-DBOOST_USER_CONFIG="<config.h>")
 endif(MSVC)
-
+       
 if(MSVC AND NOT disable-pch)
        configure_file(${CMAKE_SOURCE_DIR}/pcheaders.h    ${CMAKE_BINARY_DIR}/pcheaders.h)
        configure_file(${CMAKE_SOURCE_DIR}/config.C.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_pch.C)

diff --git a/development/cmake/src/CMakeLists.txt b/development/cmake/src/CMakeLists.txt
index 25da339d6ee1179e9b612fafc2b522d48420b902..71b4c09b8e05161931bba149f5ee1f7636e9cd18 100644 (file)
--- a/development/cmake/src/CMakeLists.txt
+++ b/development/cmake/src/CMakeLists.txt
@@ -40,6 +40,7 @@ lyx_add_msvc_pch(lyx)
 set(lyx_sources ${lyx_sources} ${CMAKE_CURRENT_BINARY_DIR}/version.C)
 
 add_executable(lyx-${qt_postfix}
+       ${WIN32_CONSOLE}
        ${lyx_sources} 
        ${lyx_headers}
        )