anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 05:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Windows only: A try to compile with LYX_CONSOLE again

Browse Source 
The use of the value "FORCE" was wrong anyway, since LYX_CONSOLE
is of type "BOOL".
This commit is contained in:
Kornel Benko 2017-08-18 12:07:03 +02:00
parent a0e95a2c1b
commit 854d7e1619
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -153,7 +153,7 @@ LYX_OPTION(STDLIB_DEBUG "Use debug stdlib" OFF GCC)
LYX_OPTION(PROFILE "Build with options for gprof" OFF GCC)
# MSVC specific
LYX_OPTION(CONSOLE "Show console on Windows, enforce with =FORCE" ON MSVC)
LYX_OPTION(CONSOLE "Show console on Windows" ON MSVC)
LYX_OPTION(VLD "Use VLD with MSVC" OFF MSVC)
LYX_OPTION(WALL "Enable all warnings" OFF MSVC)
LYX_OPTION(DEPENDENCIES_DOWNLOAD "Download dependencies for MSVC 10" OFF MSVC)
@ -188,11 +188,6 @@ if(LYX_INSTALL)
if(WIN32 AND NOT MINGW)
set(LYX_HUNSPELL ON)
endif()
if(LYX_CONSOLE MATCHES "FORCE")
set(LYX_CONSOLE ON)
else()
set(LYX_CONSOLE OFF)
endif()
set(LYX_PACKAGE_SUFFIX ON)
if(NOT LYX_DEBUG)
set(LYX_RELEASE ON)

2
development/cmake/build5-2015-x64.bat
View File

@ -73,7 +73,7 @@ REM start with a new cmake run
if "%1%" == "devel" (
REM Build solution to develop LyX
REM you can add the option "-GNinja" for a faster compilation
cmake %LYX_SOURCE% -G"Visual Studio 14 2015 Win64" -DLYX_USE_QT=QT5 -DLYX_ENABLE_EXPORT_TESTS=0 -DLYX_MERGE_FILES=0 -DLYX_NLS=1 -DLYX_INSTALL=0 -DLYX_RELEASE=0 -DLYX_CONSOLE=FORCE -DLYX_3RDPARTY_BUILD=1 %DEPENDENCIES_DOWNLOAD%
cmake %LYX_SOURCE% -G"Visual Studio 14 2015 Win64" -DLYX_USE_QT=QT5 -DLYX_ENABLE_EXPORT_TESTS=0 -DLYX_MERGE_FILES=0 -DLYX_NLS=1 -DLYX_INSTALL=0 -DLYX_RELEASE=0 -DLYX_CONSOLE=ON -DLYX_3RDPARTY_BUILD=1 %DEPENDENCIES_DOWNLOAD%
msbuild src\LyX.vcxproj /p:Configuration=Debug
msbuild src\tex2lyx\tex2lyx.vcxproj /p:Configuration=Debug
)