anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cmake windows build: Discard use of configCompiler.h.msvc

Browse Source 
This file doubles the struggle when inventing new configuration tests.
Hopefully we get soon a confirmation if the withdraw is OK.
This commit is contained in:
Kornel Benko 2016-06-15 11:29:09 +02:00
parent 0eb0a3d94d
commit a71fba47ab
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -156,7 +156,6 @@ LYX_OPTION(PROFILE "Build with options for gprof" OFF GCC)
LYX_OPTION(CONSOLE "Show console on Windows, enforce with =FORCE" 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(VLD "Use VLD with MSVC" OFF MSVC)
LYX_OPTION(WALL "Enable all warnings" OFF MSVC) LYX_OPTION(WALL "Enable all warnings" OFF MSVC)
LYX_OPTION(CONFIGURE_CHECKS "Also run configure checks for MSVC" OFF MSVC)
LYX_OPTION(DEPENDENCIES_DOWNLOAD "Download dependencies for MSVC 10" OFF MSVC) LYX_OPTION(DEPENDENCIES_DOWNLOAD "Download dependencies for MSVC 10" OFF MSVC)
# APPLE specific # APPLE specific
@ -904,13 +903,9 @@ if (WIN32 AND Qt5Core_FOUND)
set(Z_PREFIX 1) set(Z_PREFIX 1)
endif() endif()
# compiler tests, config.h generation # compiler tests, config.h generation LYX_CONFIGURE_CHECKS
if(MSVC AND NOT LYX_CONFIGURE_CHECKS) include(${LYX_CMAKE_DIR}/ConfigureChecks.cmake)
configure_file(${LYX_CMAKE_DIR}/configCompiler.h.msvc ${TOP_BINARY_DIR}/configCompiler.h) configure_file(${LYX_CMAKE_DIR}/configCompiler.h.cmake ${TOP_BINARY_DIR}/configCompiler.h)
else()
include(${LYX_CMAKE_DIR}/ConfigureChecks.cmake)
configure_file(${LYX_CMAKE_DIR}/configCompiler.h.cmake ${TOP_BINARY_DIR}/configCompiler.h)
endif()
set(QPA_XCB) set(QPA_XCB)
if(Qt5X11Extras_FOUND AND QT_USES_X11) if(Qt5X11Extras_FOUND AND QT_USES_X11)

1
INSTALL.cmake
View File

@ -162,7 +162,6 @@ Build options
-- LYX_CONSOLE = ON : Show console on Windows -- LYX_CONSOLE = ON : Show console on Windows
-- LYX_VLD = OFF : Use VLD with MSVC -- LYX_VLD = OFF : Use VLD with MSVC
-- LYX_WALL = OFF : Enable all warnings -- LYX_WALL = OFF : Enable all warnings
-- LYX_CONFIGURE_CHECKS = OFF : Also run configure checks for MSVC
-- LYX_DEPENDENCIES_DOWNLOAD= OFF : Download precompiled 3rd party libraries for MSVC 10 -- LYX_DEPENDENCIES_DOWNLOAD= OFF : Download precompiled 3rd party libraries for MSVC 10