From 2e516e92046da45686c80db565a8d663b138433f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Peter=20K=C3=BCmmel?= Date: Sat, 22 Jan 2011 11:35:50 +0000 Subject: [PATCH] sort options by compiler git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37295 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/cmake/CMakeLists.txt | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt index 40e15d0777..6d4f95f1c0 100644 --- a/development/cmake/CMakeLists.txt +++ b/development/cmake/CMakeLists.txt @@ -54,29 +54,34 @@ if(LYX_INSTALL) set(LYX_PROFILE OFF CACHE BOOL "Profile option" FORCE) endif() +# Options for all compilers/systems LYX_OPTION(NLS "Use nls" OFF ALL) LYX_OPTION(ASPELL "Require aspell" OFF ALL) LYX_OPTION(ENCHANT "Require Enchant" OFF ALL) LYX_OPTION(HUNSPELL "Require Hunspell" OFF ALL) LYX_OPTION(DEVEL_VERSION "Build developer version" OFF ALL) LYX_OPTION(RELEASE "Build release version, build debug when disabled" ON ALL) -LYX_OPTION(PROFILE "Build profile version" OFF GCC) -LYX_OPTION(EXTERNAL_BOOST "Use external boost" OFF GCC) -LYX_OPTION(EXTERNAL_LIBINTL "Use external libintl" ON 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(INSTALL_PREFIX "Install path for LyX" OFF ALL) -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(PCH "Use precompiled headers" OFF ALL) LYX_OPTION(MERGE_FILES "Merge source files into one compilation unit" OFF ALL) LYX_OPTION(MERGE_REBUILD "Rebuild generated files from merged files build" OFF ALL) +LYX_OPTION(QUIET "Don't generate verbose makefiles" OFF ALL) +LYX_OPTION(INSTALL_PREFIX "Install path for LyX" OFF ALL) +LYX_OPTION(EXTERNAL_LIBINTL "Use external libintl" ON ALL) + +# GCC specific +LYX_OPTION(PROFILE "Build profile version" OFF GCC) +LYX_OPTION(EXTERNAL_BOOST "Use external boost" OFF GCC) +LYX_OPTION(PROGRAM_SUFFIX "Append version suffix to binaries" ON GCC) LYX_OPTION(DEBUG_GLIBC "Enable libstdc++ debug mode" OFF GCC) LYX_OPTION(DEBUG_GLIBC_PEDANTIC "Enable libstdc++pedantic debug mode" OFF GCC) LYX_OPTION(STDLIB_DEBUG "Use debug stdlib" OFF GCC) LYX_OPTION(CONCEPT_CHECKS "Enable concept-checks" OFF GCC) -LYX_OPTION(QUIET "Don't generate verbose makefiles" OFF ALL) + +# MSVC specific +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(LYX_CONFIGURE_CHECKS "Also run configure checks for MSVC" OFF MSVC) -- 2.39.5