From: Kornel Benko Date: Wed, 1 Sep 2010 09:41:14 +0000 (+0000) Subject: Add ddebian dependncies, remove unneeded aiksaurus X-Git-Tag: 2.0.0~2720 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=bf72a8097ac24e09de29e80d08fd374db2793ed2;p=lyx.git Add ddebian dependncies, remove unneeded aiksaurus git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35253 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt index 733051b486..f9be766631 100644 --- a/development/cmake/CMakeLists.txt +++ b/development/cmake/CMakeLists.txt @@ -42,7 +42,6 @@ LYX_OPTION(INSTALL "Build install projects/rules (implies a bunch of other optio if(LYX_INSTALL) set(LYX_NLS ON CACHE BOOL "Nls option" FORCE) set(LYX_ASPELL ON CACHE BOOL "Aspell option" FORCE) - set(LYX_AIKSAURUS ON CACHE BOOL "Aiksaurus option" FORCE) if (WIN32) set(LYX_HUNSPELL ON CACHE BOOL "Hunspell option" FORCE) endif() @@ -55,7 +54,6 @@ endif() LYX_OPTION(NLS "Use nls" OFF ALL) LYX_OPTION(ASPELL "Require aspell" OFF ALL) -LYX_OPTION(AIKSAURUS "Require Aiksaurus" OFF ALL) LYX_OPTION(ENCHANT "Require Enchant" OFF ALL) LYX_OPTION(HUNSPELL "Require Hunspell" OFF ALL) LYX_OPTION(DEBUG "Build debug version" OFF ALL) @@ -261,11 +259,6 @@ if(LYX_ASPELL) include_directories(${ASPELL_INCLUDE_DIR}) endif() -if(LYX_AIKSAURUS) - find_package(AiksaurusLIB REQUIRED) - include_directories(${AIKSAURUSLIB_INCLUDE_DIR}) -endif() - if(LYX_ENCHANT) find_package(Enchant REQUIRED) include_directories(${ENCHANT_INCLUDE_DIR}) @@ -509,6 +502,14 @@ SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libqtgui4 (>= 4.4.3-0)") IF(ASPELL_FOUND) SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libaspell15 (>= 0.60.6-1),${CPACK_DEBIAN_PACKAGE_DEPENDS}") ENDIF() +if(ENCHANT_FOUND) + SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libenchant1c2a (>= 1.6.0-0),${CPACK_DEBIAN_PACKAGE_DEPENDS}") +ENDIF() +IF(LYX_USE_EXTERNAL_BOOST) + IF(Boost_FOUND) + SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-regex1.38.0 (>= 1.38.0-6),libboost-signals1.38.0 (>= 1.38.0-6),${CPACK_DEBIAN_PACKAGE_DEPENDS}") + ENDIF() +ENDIF() # # for the next ones, cpack insists on data with values in some file SET(CPACK_PACKAGE_DESCRIPTION_FILE "${TOP_SRC_DIR}/development/cmake/LyX_description.txt")