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

Amend 0e50ad8 'move mythes sources to 3rdparty' for cmake build.

Browse Source
This commit is contained in:
Kornel Benko 2017-03-06 19:31:23 +01:00
parent 0e50ad8b16
commit 15babdc0f1
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@ -143,9 +143,10 @@ LYX_OPTION(ENABLE_KEYTESTS "Enable for keytests" OFF ALL)
LYX_OPTION(ASAN "Use address sanitizer" OFF ALL) LYX_OPTION(ASAN "Use address sanitizer" OFF ALL)
LYX_COMBO(USE_QT "Use Qt version as frontend" QT4 QT5) LYX_COMBO(USE_QT "Use Qt version as frontend" QT4 QT5)
#LYX_OPTION(3RDPARTY_BUILD "Build 3rdparty libs" OFF ALL) #LYX_OPTION(3RDPARTY_BUILD "Build 3rdparty libs" OFF ALL)
LYX_OPTION(EXTERNAL_Z "Build 3rdparty lib zlib" ON ALL) LYX_OPTION(EXTERNAL_Z "Do not build 3rdparty lib zlib" ON ALL)
LYX_OPTION(EXTERNAL_ICONV "Build 3rdparty lib iconvlib" ON ALL) LYX_OPTION(EXTERNAL_ICONV "Do not build 3rdparty lib iconvlib" ON ALL)
LYX_OPTION(EXTERNAL_HUNSPELL "Build 3rdparty lib hunspelllib" ON ALL) LYX_OPTION(EXTERNAL_HUNSPELL "Do not build 3rdparty lib hunspelllib" ON ALL)
LYX_OPTION(EXTERNAL_MYTHES "Do not build 3rdparty lib mytheslib" OFF ALL)
# GCC specific # GCC specific
LYX_OPTION(PROFILE "Build profile version" OFF GCC) LYX_OPTION(PROFILE "Build profile version" OFF GCC)
@ -183,6 +184,12 @@ if(LYX_DMG)
set(LYX_CPACK ON) set(LYX_CPACK ON)
endif() endif()
if (LYX_EXTERNAL_MYTHES)
message(FATAL_ERROR "Compilation with system mythes not supported yet")
else()
set(MYTHES_DIR "${TOP_SRC_DIR}/3rdparty/mythes/1.2.5")
endif()
if(LYX_CPACK) if(LYX_CPACK)
set(LYX_INSTALL ON) set(LYX_INSTALL ON)
endif() endif()
@ -284,7 +291,7 @@ if(UNIX OR MINGW)
# see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631 # see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631
set(LYX_USE_STD_REGEX 0) set(LYX_USE_STD_REGEX 0)
else() else()
set(LYX_USE_STD_REGEX 1) set(LYX_USE_STD_REGEX 0)
endif() endif()
endif() endif()
set(LYX_GCC11_MODE "${CXX11_FLAG}") set(LYX_GCC11_MODE "${CXX11_FLAG}")

2
development/cmake/config.h.cmake
View File

@ -96,7 +96,7 @@ ${Include_used_spellchecker}
#endif // config.h guard #endif // config.h guard
#define MYTHES_H_LOCATION <${MYTHES_DIR}/mythes.hxx>
// Unguarded cleanup of global namespace: // Unguarded cleanup of global namespace:

6
src/support/CMakeLists.txt
View File

@ -18,8 +18,8 @@ endif()
file(GLOB support_headers ${TOP_SRC_DIR}/src/support/${LYX_HPP_FILES}) file(GLOB support_headers ${TOP_SRC_DIR}/src/support/${LYX_HPP_FILES})
file(GLOB support_mythes_sources ${TOP_SRC_DIR}/src/support/mythes/*.cxx) file(GLOB support_mythes_sources ${MYTHES_DIR}/*.cxx)
file(GLOB support_mythes_headers ${TOP_SRC_DIR}/src/support/mythes/*.hxx) file(GLOB support_mythes_headers ${MYTHES_DIR}/*.hxx)
file(GLOB support_linkback_sources ${TOP_SRC_DIR}/src/support/linkback/*.m*) file(GLOB support_linkback_sources ${TOP_SRC_DIR}/src/support/linkback/*.m*)
file(GLOB support_linkback_headers ${TOP_SRC_DIR}/src/support/linkback/*.h) file(GLOB support_linkback_headers ${TOP_SRC_DIR}/src/support/linkback/*.h)
@ -58,7 +58,7 @@ lyx_automoc(${support_sources})
include_directories( include_directories(
${TOP_SRC_DIR}/src/support ${TOP_SRC_DIR}/src/support
${TOP_BINARY_DIR}/src/support ${TOP_BINARY_DIR}/src/support
${TOP_SRC_DIR}/src/support/mythes ${MYTHES_DIR}
${QT_INCLUDES} ${QT_INCLUDES}
${ICONV_INCLUDE_DIR} ${ICONV_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}) ${ZLIB_INCLUDE_DIR})