From 776329b93ff18955d899cdc49ef99610459ab989 Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Fri, 13 Aug 2010 23:35:30 +0200 Subject: [PATCH] Rename cmake options DISABLE_XXX to ENABLE_XXX --- CMakeLists.txt | 50 +++++++++++++++--------------- doc/CMakeLists.txt | 4 +-- src/CMakeLists.txt | 17 +++++----- src/gui/CMakeLists.txt | 4 +-- src/plugins/CMakeLists.txt | 36 ++++++++++----------- src/plugins/scripts/CMakeLists.txt | 20 ++++++------ 6 files changed, 65 insertions(+), 66 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 29e5d97d0..c92cb3b69 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,33 +59,33 @@ ELSE(DEFINED INCLUDEDIR) SET(INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME}) ENDIF(DEFINED INCLUDEDIR) -OPTION(DISABLE_NCURSES "Disable Ncurses interface") -OPTION(ENABLE_GTK "Enable GTK interface") -OPTION(DISABLE_NLS "Disable Native Language Support") -OPTION(DISABLE_GCRYPT "Disable libgcrypt support") -OPTION(DISABLE_GNUTLS "Disable SSLv3/TLS connection support") -OPTION(DISABLE_LARGEFILE "Disable Large File Support") -OPTION(DISABLE_ALIAS "Disable Alias plugin") -OPTION(DISABLE_ASPELL "Disable Aspell plugin") -OPTION(DISABLE_CHARSET "Disable Charset plugin") -OPTION(ENABLE_DEMO "Enable Demo plugin") -OPTION(DISABLE_FIFO "Disable FIFO plugin") -OPTION(DISABLE_IRC "Disable IRC plugin") -OPTION(DISABLE_LOGGER "Disable Logger plugin") -OPTION(ENABLE_RELAY "Enable Relay plugin") -OPTION(DISABLE_RMODIFIER "Disable Rmodifier plugin") -OPTION(DISABLE_SCRIPTS "Disable script plugins") -OPTION(DISABLE_PERL "Disable Perl scripting language") -OPTION(DISABLE_PYTHON "Disable Python scripting language") -OPTION(DISABLE_RUBY "Disable Ruby scripting language") -OPTION(DISABLE_LUA "Disable Lua scripting language") -OPTION(DISABLE_TCL "Disable Tcl scripting language") -OPTION(DISABLE_XFER "Disable Xfer plugin (file transfer and direct chat)") -OPTION(DISABLE_DOC "Disable Doc") +OPTION(ENABLE_NCURSES "Enable Ncurses interface" ON) +OPTION(ENABLE_GTK "Enable GTK interface" OFF) +OPTION(ENABLE_NLS "Enable Native Language Support" ON) +OPTION(ENABLE_GCRYPT "Enable libgcrypt support" ON) +OPTION(ENABLE_GNUTLS "Enable SSLv3/TLS support" ON) +OPTION(ENABLE_LARGEFILE "Enable Large File Support" ON) +OPTION(ENABLE_ALIAS "Enable Alias plugin" ON) +OPTION(ENABLE_ASPELL "Enable Aspell plugin" ON) +OPTION(ENABLE_CHARSET "Enable Charset plugin" ON) +OPTION(ENABLE_DEMO "Enable Demo plugin" OFF) +OPTION(ENABLE_FIFO "Enable FIFO plugin" ON) +OPTION(ENABLE_IRC "Enable IRC plugin" ON) +OPTION(ENABLE_LOGGER "Enable Logger plugin" ON) +OPTION(ENABLE_RELAY "Enable Relay plugin" OFF) +OPTION(ENABLE_RMODIFIER "Enable Rmodifier plugin" ON) +OPTION(ENABLE_SCRIPTS "Enable script plugins" ON) +OPTION(ENABLE_PERL "Enable Perl scripting language" ON) +OPTION(ENABLE_PYTHON "Enable Python scripting language" ON) +OPTION(ENABLE_RUBY "Enable Ruby scripting language" ON) +OPTION(ENABLE_LUA "Enable Lua scripting language" ON) +OPTION(ENABLE_TCL "Enable Tcl scripting language" ON) +OPTION(ENABLE_XFER "Enable Xfer plugin" ON) +OPTION(ENABLE_DOC "Enable Documentation" ON) -IF(NOT DISABLE_NLS) +IF(ENABLE_NLS) ADD_SUBDIRECTORY( po ) -ENDIF(NOT DISABLE_NLS) +ENDIF(ENABLE_NLS) ADD_SUBDIRECTORY( src ) ADD_SUBDIRECTORY( doc ) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index ecf66a57f..3ccad8e11 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -18,7 +18,7 @@ # along with WeeChat. If not, see . # -IF(NOT DISABLE_DOC) +IF(ENABLE_DOC) FIND_PACKAGE(Sourcehighlight) FIND_PACKAGE(Asciidoc) @@ -32,6 +32,6 @@ IF(NOT DISABLE_DOC) ADD_SUBDIRECTORY( it ) ENDIF(ASCIIDOC_FOUND AND SOURCEHIGHLIGHT_FOUND) -ENDIF(NOT DISABLE_DOC) +ENDIF(ENABLE_DOC) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat-curses.1 DESTINATION ${SHAREDIR}/man/man1) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9fd5ee31e..60874cc4f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -68,30 +68,29 @@ CHECK_FUNCTION_EXISTS(strstr HAVE_STRSTR) SET(STATIC_LIBS weechat_gui_common) # Check for Large File Support -IF (NOT DISABLE_LARGEFILE) +IF(ENABLE_LARGEFILE) ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGE_FILES) -ENDIF (NOT DISABLE_LARGEFILE) +ENDIF(ENABLE_LARGEFILE) # Check for Gettext -IF(NOT DISABLE_NLS) +IF(ENABLE_NLS) FIND_PACKAGE(Gettext) IF(GETTEXT_FOUND) ADD_DEFINITIONS(-DENABLE_NLS) ENDIF(GETTEXT_FOUND) -ENDIF(NOT DISABLE_NLS) +ENDIF(ENABLE_NLS) # Check for libgcrypt -IF(NOT DISABLE_GCRYPT) +IF(ENABLE_GCRYPT) FIND_PACKAGE(Gcrypt) - IF(GCRYPT_FOUND) ADD_DEFINITIONS(-DHAVE_GCRYPT) LIST(APPEND EXTRA_LIBS "${GCRYPT_LDFLAGS}") ENDIF(GCRYPT_FOUND) -ENDIF(NOT DISABLE_GCRYPT) +ENDIF(ENABLE_GCRYPT) # Check for GnuTLS -IF(NOT DISABLE_GNUTLS) +IF(ENABLE_GNUTLS) FIND_PACKAGE(GnuTLS) IF(GNUTLS_FOUND) @@ -101,7 +100,7 @@ IF(NOT DISABLE_GNUTLS) SET(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -L${GNUTLS_LIBRARY_PATH}") LIST(APPEND EXTRA_LIBS gnutls) ENDIF(GNUTLS_FOUND) -ENDIF(NOT DISABLE_GNUTLS) +ENDIF(ENABLE_GNUTLS) # Check for iconv FIND_PACKAGE(Iconv) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index c310dedd6..90d7ec128 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -39,9 +39,9 @@ gui-window.c gui-window.h) INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}) ADD_LIBRARY(weechat_gui_common STATIC ${LIB_GUI_COMMON_SRC}) -IF(NOT DISABLE_NCURSES) +IF(ENABLE_NCURSES) SUBDIRS( curses ) -ENDIF(NOT DISABLE_NCURSES) +ENDIF(ENABLE_NCURSES) IF(ENABLE_GTK) ADD_SUBDIRECTORY( gtk ) diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index 349aa4c22..11cdb689e 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -31,55 +31,55 @@ INCLUDE(CheckIncludeFiles) INCLUDE(CheckFunctionExists) INCLUDE(CheckLibraryExists) -IF(NOT DISABLE_ALIAS) +IF(ENABLE_ALIAS) ADD_SUBDIRECTORY( alias ) -ENDIF(NOT DISABLE_ALIAS) +ENDIF(ENABLE_ALIAS) -IF(NOT DISABLE_ASPELL) +IF(ENABLE_ASPELL) # Check for aspell libraries FIND_PACKAGE(Aspell) IF(ASPELL_FOUND) ADD_SUBDIRECTORY( aspell ) ENDIF(ASPELL_FOUND) -ENDIF(NOT DISABLE_ASPELL) +ENDIF(ENABLE_ASPELL) -IF(NOT DISABLE_CHARSET) +IF(ENABLE_CHARSET) # Check for iconv support. IF(ICONV_FOUND) ADD_SUBDIRECTORY( charset ) ENDIF(ICONV_FOUND) -ENDIF(NOT DISABLE_CHARSET) +ENDIF(ENABLE_CHARSET) IF(ENABLE_DEMO) ADD_SUBDIRECTORY( demo ) ENDIF(ENABLE_DEMO) -IF(NOT DISABLE_FIFO) +IF(ENABLE_FIFO) ADD_SUBDIRECTORY( fifo ) -ENDIF(NOT DISABLE_FIFO) +ENDIF(ENABLE_FIFO) -IF(NOT DISABLE_IRC) +IF(ENABLE_IRC) ADD_SUBDIRECTORY( irc ) -ENDIF(NOT DISABLE_IRC) +ENDIF(ENABLE_IRC) -IF(NOT DISABLE_LOGGER) +IF(ENABLE_LOGGER) ADD_SUBDIRECTORY( logger ) -ENDIF(NOT DISABLE_LOGGER) +ENDIF(ENABLE_LOGGER) IF(ENABLE_RELAY) ADD_SUBDIRECTORY( relay ) ENDIF(ENABLE_RELAY) -IF(NOT DISABLE_RMODIFIER) +IF(ENABLE_RMODIFIER) ADD_SUBDIRECTORY( rmodifier ) -ENDIF(NOT DISABLE_RMODIFIER) +ENDIF(ENABLE_RMODIFIER) -IF(NOT DISABLE_SCRIPTS OR NOT DISABLE_PERL OR NOT DISABLE_PYTHON OR NOT DISABLE_RUBY OR NOT DISABLE_LUA OR NOT DISABLE_TCL) +IF(ENABLE_SCRIPTS OR ENABLE_PERL OR ENABLE_PYTHON OR ENABLE_RUBY OR ENABLE_LUA OR ENABLE_TCL) ADD_SUBDIRECTORY( scripts ) -ENDIF(NOT DISABLE_SCRIPTS OR NOT DISABLE_PERL OR NOT DISABLE_PYTHON OR NOT DISABLE_RUBY OR NOT DISABLE_LUA OR NOT DISABLE_TCL) +ENDIF(ENABLE_SCRIPTS OR ENABLE_PERL OR ENABLE_PYTHON OR ENABLE_RUBY OR ENABLE_LUA OR ENABLE_TCL) -IF(NOT DISABLE_XFER) +IF(ENABLE_XFER) ADD_SUBDIRECTORY( xfer ) -ENDIF(NOT DISABLE_XFER) +ENDIF(ENABLE_XFER) INSTALL(FILES weechat-plugin.h DESTINATION ${INCLUDEDIR}) diff --git a/src/plugins/scripts/CMakeLists.txt b/src/plugins/scripts/CMakeLists.txt index e0d46b984..9c6148f71 100644 --- a/src/plugins/scripts/CMakeLists.txt +++ b/src/plugins/scripts/CMakeLists.txt @@ -24,37 +24,37 @@ ADD_DEFINITIONS(${CMAKE_SHARED_LIBRARY_C_FLAGS}) INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}) ADD_LIBRARY(weechat_scripts STATIC ${LIB_SCRIPTS_SRC}) -IF(NOT DISABLE_PERL) +IF(ENABLE_PERL) FIND_PACKAGE(Perl) IF(PERL_FOUND) ADD_SUBDIRECTORY( perl ) ENDIF(PERL_FOUND) -ENDIF(NOT DISABLE_PERL) +ENDIF(ENABLE_PERL) -IF(NOT DISABLE_PYTHON) +IF(ENABLE_PYTHON) FIND_PACKAGE(Python) IF(PYTHON_FOUND) ADD_SUBDIRECTORY( python ) ENDIF(PYTHON_FOUND) -ENDIF(NOT DISABLE_PYTHON) +ENDIF(ENABLE_PYTHON) -IF(NOT DISABLE_RUBY) +IF(ENABLE_RUBY) FIND_PACKAGE(Ruby) IF(RUBY_FOUND) ADD_SUBDIRECTORY( ruby ) ENDIF(RUBY_FOUND) -ENDIF(NOT DISABLE_RUBY) +ENDIF(ENABLE_RUBY) -IF(NOT DISABLE_LUA) +IF(ENABLE_LUA) FIND_PACKAGE(Lua) IF(LUA_FOUND) ADD_SUBDIRECTORY( lua ) ENDIF(LUA_FOUND) -ENDIF(NOT DISABLE_LUA) +ENDIF(ENABLE_LUA) -IF(NOT DISABLE_TCL) +IF(ENABLE_TCL) FIND_PACKAGE(TCL) IF(TCL_FOUND) ADD_SUBDIRECTORY( tcl ) ENDIF(TCL_FOUND) -ENDIF(NOT DISABLE_TCL) +ENDIF(ENABLE_TCL)