From: Peter Kümmel Date: Wed, 14 Jul 2010 11:58:21 +0000 (+0000) Subject: cmake: disbale LYX_INSTALL by default, when set enable other relevant options X-Git-Tag: 2.0.0~2985 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=4ab78db6b4f1cd6bcad84eb7af955851ae1ae558;p=features.git cmake: disbale LYX_INSTALL by default, when set enable other relevant options git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34896 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt index a8dae74910..bf8f1a74f1 100644 --- a/development/cmake/CMakeLists.txt +++ b/development/cmake/CMakeLists.txt @@ -38,8 +38,8 @@ LYX_OPTION(RELEASE "Build release version" ON ALL) LYX_OPTION(PROFILE "Build profile version" OFF GCC) LYX_OPTION(USE_EXTERNAL_BOOST "Use external boost" OFF GCC) LYX_OPTION(USE_EXTERNAL_LIBINTL "Use external libintl" ON ALL) -LYX_OPTION(INSTALL "Build install projects/rules" ON ALL) -LYX_OPTION(PACKAGE_SUFFIX "Use version suffix for packaging" OFF ALL) +LYX_OPTION(INSTALL "Build install projects/rules" OFF ALL) +LYX_OPTION(PACKAGE_SUFFIX "Use version suffix for packaging" ON ALL) LYX_OPTION(PROGRAM_SUFFIX "Append version suffix to binaries" ON GCC) LYX_OPTION(NO_CONSOLE "Suppress console on Windows" OFF MSVC) LYX_OPTION(VLD "Use VLD with MSVC" OFF MSVC) @@ -76,7 +76,15 @@ else() endif() - +if(LYX_INSTALL) + set(LYX_ASPELL ON CACHE BOOL "Aspell option" FORCE) + set(LYX_NLS ON CACHE BOOL "Nls option" FORCE) + SET(LYX_NO_CONSOLE ON CACHE BOOL "No console option" FORCE) + SET(PACKAGE_SUFFIX ON CACHE BOOL "Package suffix option" FORCE) + SET(LYX_RELEASE ON CACHE BOOL "Release option" FORCE) + SET(LYX_DEBUG OFF CACHE BOOL "Debug option" FORCE) + SET(LYX_PROFILE OFF CACHE BOOL "Profile option" FORCE) +endif() # Supress regeneration