diff options
39 files changed, 254 insertions, 210 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b33696856..47e6562c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -257,19 +257,23 @@ configure_file(config.h.cmake config.h @ONLY) # set the git version in "config-git.h" add_custom_target(version_git ALL COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/tools/git-version.sh" "${CMAKE_CURRENT_SOURCE_DIR}" "${VERSION}" "config-git.h" - WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") + WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" +) configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" - IMMEDIATE @ONLY) + IMMEDIATE @ONLY +) add_custom_target(uninstall - "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") + "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" +) add_custom_target(dist "${CMAKE_CURRENT_SOURCE_DIR}/tools/makedist.sh" "${VERSION}" "HEAD" "${CMAKE_CURRENT_BINARY_DIR}" - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +) # pkgconfig file set(PACKAGE "${PROJECT_NAME}") @@ -291,7 +295,8 @@ if(CYGWIN) ${CMAKE_CURRENT_SOURCE_DIR}/Contributing.adoc ${CMAKE_CURRENT_SOURCE_DIR}/README.adoc ${CMAKE_CURRENT_SOURCE_DIR}/ReleaseNotes.adoc - DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME}) + DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME} + ) endif() # icon @@ -313,7 +318,8 @@ set(CPACK_PACKAGE_FILE_NAME weechat-binary-${VERSION}) # source package set(CPACK_SOURCE_GENERATOR "TGZ;TBZ2") set(CPACK_SOURCE_PACKAGE_FILE_NAME weechat-${VERSION}) -set(CPACK_SOURCE_IGNORE_FILES "/\\\\.git" "/build/" "/m4/" +set(CPACK_SOURCE_IGNORE_FILES + "/\\\\.git" "/build/" "/m4/" "/autom4te\\\\.cache/" "/ABOUT-NLS$" "/config\\\\.guess$" "/config\\\\.h$" "/config\\\\.h.in$" "/config\\\\.log$" "/config\\\\.rpath$" "/config\\\\.status$" "/config\\\\.sub$" "/configure$" "/depcomp$" diff --git a/cmake/FindAsciidoctor.cmake b/cmake/FindAsciidoctor.cmake index 43f61cef8..9ff57ca01 100644 --- a/cmake/FindAsciidoctor.cmake +++ b/cmake/FindAsciidoctor.cmake @@ -34,7 +34,7 @@ if(ASCIIDOCTOR_EXECUTABLE) execute_process( COMMAND ${ASCIIDOCTOR_EXECUTABLE} --version OUTPUT_VARIABLE ASCIIDOCTOR_VERSION - ) + ) string(REGEX REPLACE "^Asciidoctor ([^ ]+) .*" "\\1" ASCIIDOCTOR_VERSION "${ASCIIDOCTOR_VERSION}") @@ -45,5 +45,5 @@ if(ASCIIDOCTOR_EXECUTABLE) mark_as_advanced( ASCIIDOCTOR_EXECUTABLE ASCIIDOCTOR_VERSION - ) + ) endif() diff --git a/cmake/FindAspell.cmake b/cmake/FindAspell.cmake index 96c5fb906..e9761eaad 100644 --- a/cmake/FindAspell.cmake +++ b/cmake/FindAspell.cmake @@ -55,4 +55,4 @@ endif() mark_as_advanced( ASPELL_INCLUDE_PATH ASPELL_LIBRARY - ) +) diff --git a/cmake/FindCppUTest.cmake b/cmake/FindCppUTest.cmake index 4bf60c151..b2ce51404 100644 --- a/cmake/FindCppUTest.cmake +++ b/cmake/FindCppUTest.cmake @@ -27,8 +27,8 @@ # CPPUTEST_LIBRARIES = Link options to compile with CppUTest if(CPPUTEST_FOUND) - # Already in cache, be silent - set(CPPUTEST_FIND_QUIETLY TRUE) + # Already in cache, be silent + set(CPPUTEST_FIND_QUIETLY TRUE) endif() find_package(PkgConfig) diff --git a/cmake/FindENCHANT.cmake b/cmake/FindENCHANT.cmake index dd9a90962..3fbcb35ee 100644 --- a/cmake/FindENCHANT.cmake +++ b/cmake/FindENCHANT.cmake @@ -13,10 +13,8 @@ if(ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES) - # in cache already set(ENCHANT_FOUND TRUE) - else() if(NOT WIN32) # use pkg-config to get the directories and then use these values @@ -27,17 +25,19 @@ else() endif() find_path(ENCHANT_INCLUDE_DIR - NAMES enchant++.h - HINTS ${PC_ENCHANT_INCLUDEDIR} - ${PC_ENCHANT_INCLUDE_DIRS} - PATH_SUFFIXES enchant ) + NAMES enchant++.h + HINTS ${PC_ENCHANT_INCLUDEDIR} ${PC_ENCHANT_INCLUDE_DIRS} + PATH_SUFFIXES enchant + ) - find_library(ENCHANT_LIBRARIES NAMES enchant - HINTS ${PC_ENCHANT_LIBDIR} - ${PC_ENCHANT_LIBRARY_DIRS} ) + find_library(ENCHANT_LIBRARIES + NAMES enchant + HINTS ${PC_ENCHANT_LIBDIR} + ${PC_ENCHANT_LIBRARY_DIRS} + ) include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(ENCHANT DEFAULT_MSG ENCHANT_INCLUDE_DIR ENCHANT_LIBRARIES ) + find_package_handle_standard_args(ENCHANT DEFAULT_MSG ENCHANT_INCLUDE_DIR ENCHANT_LIBRARIES) mark_as_advanced(ENCHANT_INCLUDE_DIR ENCHANT_LIBRARIES) @@ -47,5 +47,4 @@ else() check_symbol_exists(enchant_get_version "enchant.h" HAVE_ENCHANT_GET_VERSION) set(CMAKE_REQUIRED_INCLUDES) set(CMAKE_REQUIRED_LIBRARIES) - endif() diff --git a/cmake/FindGettext.cmake b/cmake/FindGettext.cmake index bec9ab496..fb7adb58c 100644 --- a/cmake/FindGettext.cmake +++ b/cmake/FindGettext.cmake @@ -28,8 +28,8 @@ # GETTEXT_FOUND = is gettext usable on system? if(GETTEXT_FOUND) - # Already in cache, be silent - set(GETTEXT_FIND_QUIETLY TRUE) + # Already in cache, be silent + set(GETTEXT_FIND_QUIETLY TRUE) endif() include(CheckIncludeFiles) @@ -54,7 +54,7 @@ if(HAVE_LIBINTL_H) PATHS /usr/local/lib /usr/lib - ) + ) if(LIBINTL_LIBRARY) if(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD") set(CMAKE_REQUIRED_LIBRARIES "iconv") @@ -62,7 +62,6 @@ if(HAVE_LIBINTL_H) else() check_library_exists(${LIBINTL_LIBRARY} "dgettext" "" LIBINTL_HAS_DGETTEXT) endif() - if(LIBINTL_HAS_DGETTEXT) set(GETTEXT_FOUND TRUE) endif() diff --git a/cmake/FindGnuTLS.cmake b/cmake/FindGnuTLS.cmake index ec8bc8909..3d4b3f62f 100644 --- a/cmake/FindGnuTLS.cmake +++ b/cmake/FindGnuTLS.cmake @@ -30,23 +30,23 @@ # GNUTLS_LDFLAGS = ldflags to use to compile if(GNUTLS_INCLUDE_PATH AND GNUTLS_LIBRARY) - # Already in cache, be silent - set(GNUTLS_FIND_QUIETLY TRUE) + # Already in cache, be silent + set(GNUTLS_FIND_QUIETLY TRUE) endif() find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config) execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=prefix gnutls - OUTPUT_VARIABLE GNUTLS_PREFIX + OUTPUT_VARIABLE GNUTLS_PREFIX ) execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --cflags gnutls - OUTPUT_VARIABLE GNUTLS_CFLAGS + OUTPUT_VARIABLE GNUTLS_CFLAGS ) string(REGEX REPLACE "[\r\n]" "" GNUTLS_CFLAGS "${GNUTLS_CFLAGS}") execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --libs gnutls - OUTPUT_VARIABLE GNUTLS_LDFLAGS + OUTPUT_VARIABLE GNUTLS_LDFLAGS ) string(REGEX REPLACE "[\r\n]" "" GNUTLS_LDFLAGS "${GNUTLS_LDFLAGS}") diff --git a/cmake/FindGuile.cmake b/cmake/FindGuile.cmake index 7573b0879..e1df576ac 100644 --- a/cmake/FindGuile.cmake +++ b/cmake/FindGuile.cmake @@ -27,8 +27,8 @@ # GUILE_LIBRARIES = Link options to compile Guile if(GUILE_FOUND) - # Already in cache, be silent - set(GUILE_FIND_QUIETLY TRUE) + # Already in cache, be silent + set(GUILE_FIND_QUIETLY TRUE) endif() find_package(PkgConfig) diff --git a/cmake/FindIconv.cmake b/cmake/FindIconv.cmake index edcd42856..c48ae431a 100644 --- a/cmake/FindIconv.cmake +++ b/cmake/FindIconv.cmake @@ -29,8 +29,8 @@ # ICONV_FOUND = is iconv usable on system? if(ICONV_FOUND) - # Already in cache, be silent - set(ICONV_FIND_QUIETLY TRUE) + # Already in cache, be silent + set(ICONV_FIND_QUIETLY TRUE) endif() include(CheckLibraryExists) diff --git a/cmake/FindLua.cmake b/cmake/FindLua.cmake index 85bb62e39..35b3879ee 100644 --- a/cmake/FindLua.cmake +++ b/cmake/FindLua.cmake @@ -29,8 +29,8 @@ # LUA_FOUND = is liblua usable on system? if(LUA_FOUND) - # Already in cache, be silent - set(LUA_FIND_QUIETLY TRUE) + # Already in cache, be silent + set(LUA_FIND_QUIETLY TRUE) endif() find_package(PkgConfig) diff --git a/cmake/FindPHP.cmake b/cmake/FindPHP.cmake index f253cc1ee..9654a42d3 100644 --- a/cmake/FindPHP.cmake +++ b/cmake/FindPHP.cmake @@ -32,7 +32,8 @@ if(NOT PHP_FOUND) php-config7.2 php-config72 php-config7.1 php-config71 php-config7.0 php-config70 - php-config php-config7) + php-config php-config7 + ) if (PHP_CONFIG_EXECUTABLE) execute_process(COMMAND ${PHP_CONFIG_EXECUTABLE} --prefix OUTPUT_VARIABLE PHP_LIB_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND ${PHP_CONFIG_EXECUTABLE} --includes OUTPUT_VARIABLE PHP_INCLUDE_DIRS OUTPUT_STRIP_TRAILING_WHITESPACE) @@ -41,7 +42,8 @@ if(NOT PHP_FOUND) if(${PHP_VERSION} MATCHES "^7") find_library(PHP_LIB NAMES php7.3 php7.2 php7.1 php7.0 php7 - HINTS ${PHP_LIB_PREFIX} ${PHP_LIB_PREFIX}/lib ${PHP_LIB_PREFIX}/lib64) + HINTS ${PHP_LIB_PREFIX} ${PHP_LIB_PREFIX}/lib ${PHP_LIB_PREFIX}/lib64 + ) if(PHP_LIB) get_filename_component(PHP_LIB_DIR ${PHP_LIB} DIRECTORY) string(REPLACE "-I" "" PHP_INCLUDE_DIRS ${PHP_INCLUDE_DIRS}) diff --git a/cmake/FindPerl.cmake b/cmake/FindPerl.cmake index fa50b7f58..97e6c8008 100644 --- a/cmake/FindPerl.cmake +++ b/cmake/FindPerl.cmake @@ -29,31 +29,31 @@ # PERL_LFLAGS = perl compiler options for linking if(PERL_FOUND) - # Already in cache, be silent - set(PERL_FIND_QUIETLY TRUE) + # Already in cache, be silent + set(PERL_FIND_QUIETLY TRUE) endif() find_program(PERL_EXECUTABLE NAMES perl perl5 PATHS /usr/bin /usr/local/bin /usr/pkg/bin - ) +) if(PERL_EXECUTABLE) execute_process( COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \"\$Config{archlibexp}/CORE\"" OUTPUT_VARIABLE PERL_INTERNAL_DIR - ) + ) execute_process( COMMAND ${PERL_EXECUTABLE} -MExtUtils::Embed -e ccopts OUTPUT_VARIABLE PERL_CFLAGS - ) + ) execute_process( COMMAND ${PERL_EXECUTABLE} -MExtUtils::Embed -e ldopts OUTPUT_VARIABLE PERL_LFLAGS - ) + ) # remove the new lines from the output by replacing them with empty strings string(REPLACE "\n" "" PERL_INTERNAL_DIR "${PERL_INTERNAL_DIR}") @@ -63,12 +63,12 @@ if(PERL_EXECUTABLE) find_path(PERL_INCLUDE_PATH NAMES perl.h PATHS ${PERL_INTERNAL_DIR} - ) + ) find_library(PERL_LIBRARY NAMES perl PATHS /usr/lib /usr/local/lib /usr/pkg/lib ${PERL_INTERNAL_DIR} - ) + ) if(PERL_LIBRARY AND PERL_INCLUDE_PATH) set(PERL_FOUND TRUE) @@ -80,5 +80,5 @@ if(PERL_EXECUTABLE) PERL_LIBRARY PERL_CFLAGS PERL_LFLAGS - ) + ) endif() diff --git a/cmake/FindPython.cmake b/cmake/FindPython.cmake index 2e71e4c57..dd961c686 100644 --- a/cmake/FindPython.cmake +++ b/cmake/FindPython.cmake @@ -31,7 +31,7 @@ include(FindPkgConfig) if(ENABLE_PYTHON2) - pkg_check_modules(PYTHON python2) + pkg_check_modules(PYTHON python2) else() - pkg_check_modules(PYTHON python3) + pkg_check_modules(PYTHON python3) endif() diff --git a/cmake/FindRuby.cmake b/cmake/FindRuby.cmake index 8297e0536..e0696cdf0 100644 --- a/cmake/FindRuby.cmake +++ b/cmake/FindRuby.cmake @@ -27,8 +27,8 @@ # RUBY_LIB = ruby library (found without pkg-config) if(RUBY_FOUND) - # Already in cache, be silent - set(RUBY_FIND_QUIETLY TRUE) + # Already in cache, be silent + set(RUBY_FIND_QUIETLY TRUE) endif() find_package(PkgConfig) @@ -43,33 +43,33 @@ else() find_program(RUBY_EXECUTABLE NAMES ruby2.6.0 ruby260 ruby2.6 ruby2.5.0 ruby250 ruby2.5 ruby2.4.0 ruby240 ruby2.4 ruby2.3.0 ruby230 ruby2.3 ruby23 ruby2.2.3 ruby223 ruby2.2.2 ruby222 ruby2.2.1 ruby221 ruby2.2.0 ruby220 ruby2.2 ruby22 ruby2.1.7 ruby217 ruby2.1.6 ruby216 ruby2.1.5 ruby215 ruby2.1.4 ruby214 ruby2.1.3 ruby213 ruby2.1.2 ruby212 ruby2.1.1 ruby211 ruby2.1.0 ruby210 ruby2.1 ruby21 ruby2.0 ruby20 ruby1.9.3 ruby193 ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby PATHS /usr/bin /usr/local/bin /usr/pkg/bin - ) + ) if(RUBY_EXECUTABLE) execute_process( COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubyhdrdir'] || RbConfig::CONFIG['archdir']" OUTPUT_VARIABLE RUBY_ARCH_DIR - ) + ) execute_process( COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['arch']" OUTPUT_VARIABLE RUBY_ARCH - ) + ) execute_process( COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['libdir']" OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_PATH - ) + ) execute_process( COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubylibdir']" OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH - ) + ) find_path(RUBY_INCLUDE_DIRS NAMES ruby.h PATHS ${RUBY_ARCH_DIR} - ) + ) set(RUBY_INCLUDE_ARCH "${RUBY_INCLUDE_DIRS}/${RUBY_ARCH}") find_library(RUBY_LIB NAMES ruby-1.9.3 ruby1.9.3 ruby193 ruby-1.9.2 ruby1.9.2 ruby192 ruby-1.9.1 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH} - ) + ) if(RUBY_LIB AND RUBY_INCLUDE_DIRS) set(RUBY_FOUND TRUE) endif() @@ -78,6 +78,6 @@ else() RUBY_INCLUDE_DIRS RUBY_LIBRARY_DIRS RUBY_LIB - ) + ) endif() endif() diff --git a/cmake/FindZLIB.cmake b/cmake/FindZLIB.cmake index 6ac90ee42..1713b05cf 100644 --- a/cmake/FindZLIB.cmake +++ b/cmake/FindZLIB.cmake @@ -41,7 +41,7 @@ find_library(ZLIB_LIBRARY ${ZLIB_NAMES} PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Zlib;InstallPath]/lib" - ) +) mark_as_advanced(ZLIB_LIBRARY ZLIB_INCLUDE_DIR) if(ZLIB_INCLUDE_DIR AND EXISTS "${ZLIB_INCLUDE_DIR}/zlib.h") diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt index 4028ad674..473497be1 100644 --- a/po/CMakeLists.txt +++ b/po/CMakeLists.txt @@ -30,7 +30,7 @@ set(PO_FILES pt_BR.po ru.po tr.po - ) +) set(BUGS_ADDRESS "flashcode@flashtux.org") set(POT_FILE ${PROJECT_NAME}.pot) @@ -60,7 +60,7 @@ if(XGETTEXT_EXECUTABLE AND MSGMERGE_EXECUTABLE AND MSGFMT_EXECUTABLE) ARGS -o ${POT_FILE_PATH} --add-comments='TRANSLATORS:' --keyword='_' --keyword='weechat_gettext' --keyword='N_' --keyword='NG_:1,2' --keyword='weechat_ngettext:1,2' --no-location --from-code=UTF-8 --directory=${CMAKE_SOURCE_DIR} --package-name='WeeChat' --package-version=${VERSION} --msgid-bugs-address=${BUGS_ADDRESS} --copyright-holder='NAME' ${SRC_FILES} DEPENDS ${POT_DEPENDS} COMMENT "Generating ${POT_FILE}" - ) + ) set(GMO_FILES) set(UPDATE_PO_TARGETS) @@ -76,14 +76,14 @@ if(XGETTEXT_EXECUTABLE AND MSGMERGE_EXECUTABLE AND MSGFMT_EXECUTABLE) COMMAND ${MSGFMT_EXECUTABLE} ARGS -c --statistics --verbose --output-file=/dev/null ${CMAKE_CURRENT_BINARY_DIR}/${pofile} DEPENDS ${POT_FILE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/${pofile} COMMENT "Compiling ${polang}.po" - ) + ) # Update .po files in source directory (if needed) add_custom_target( update-${pofile} COMMAND ${MSGMERGE_EXECUTABLE} --quiet --update --backup=none ${CMAKE_CURRENT_SOURCE_DIR}/${pofile} ${POT_FILE_PATH} COMMENT "Updating ${polang}.po" - ) + ) set(UPDATE_PO_TARGETS ${UPDATE_PO_TARGETS} update-${pofile}) install(FILES ${gmofile} DESTINATION ${LOCALEDIR}/${polang}/LC_MESSAGES RENAME ${PROJECT_NAME}.mo) @@ -97,7 +97,7 @@ if(XGETTEXT_EXECUTABLE AND MSGMERGE_EXECUTABLE AND MSGFMT_EXECUTABLE) update-${POT_FILE} COMMAND ${MSGMERGE_EXECUTABLE} --quiet --update --backup=none ${CMAKE_CURRENT_SOURCE_DIR}/${POT_FILE} ${POT_FILE_PATH} COMMENT "Updating ${POT_FILE}" - ) + ) # Update all .po and weechat.pot in source directory (if needed) add_custom_target(update-po DEPENDS update-${POT_FILE} ${UPDATE_PO_TARGETS}) diff --git a/src/gui/curses/headless/CMakeLists.txt b/src/gui/curses/headless/CMakeLists.txt index 847bba612..554bce8c7 100644 --- a/src/gui/curses/headless/CMakeLists.txt +++ b/src/gui/curses/headless/CMakeLists.txt @@ -46,12 +46,24 @@ set(WEECHAT_CURSES_MAIN_HEADLESS_SRC main.c) set(EXECUTABLE weechat-headless) -add_executable(${EXECUTABLE} ${WEECHAT_CURSES_MAIN_HEADLESS_SRC}) +add_executable(${EXECUTABLE} + ${WEECHAT_CURSES_MAIN_HEADLESS_SRC} +) -add_dependencies(${EXECUTABLE} weechat_gui_headless weechat_ncurses_fake) +add_dependencies(${EXECUTABLE} + weechat_gui_headless + weechat_ncurses_fake +) # Due to circular references, we must link two times with libweechat_core.a and libweechat_gui_common.a -target_link_libraries(${EXECUTABLE} ${STATIC_LIBS} weechat_gui_headless weechat_ncurses_fake ${EXTRA_LIBS} ${STATIC_LIBS} coverage_config) +target_link_libraries(${EXECUTABLE} + ${STATIC_LIBS} + weechat_gui_headless + weechat_ncurses_fake + ${EXTRA_LIBS} + ${STATIC_LIBS} + coverage_config +) # Install executable install(TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin) diff --git a/src/plugins/alias/CMakeLists.txt b/src/plugins/alias/CMakeLists.txt index 6aa2302da..f4e2ce1b1 100644 --- a/src/plugins/alias/CMakeLists.txt +++ b/src/plugins/alias/CMakeLists.txt @@ -18,11 +18,12 @@ # add_library(alias MODULE -alias.c alias.h -alias-command.c alias-command.h -alias-completion.c alias-completion.h -alias-config.c alias-config.h -alias-info.c alias-info.h) + alias.c alias.h + alias-command.c alias-command.h + alias-completion.c alias-completion.h + alias-config.c alias-config.h + alias-info.c alias-info.h +) set_target_properties(alias PROPERTIES PREFIX "") target_link_libraries(alias coverage_config) diff --git a/src/plugins/buflist/CMakeLists.txt b/src/plugins/buflist/CMakeLists.txt index 4478e2dfc..b1d8e9acb 100644 --- a/src/plugins/buflist/CMakeLists.txt +++ b/src/plugins/buflist/CMakeLists.txt @@ -18,12 +18,13 @@ # add_library(buflist MODULE -buflist.c buflist.h -buflist-bar-item.c buflist-bar-item.h -buflist-command.c buflist-command.h -buflist-config.c buflist-config.h -buflist-info.c buflist-info.h -buflist-mouse.c buflist-mouse.h) + buflist.c buflist.h + buflist-bar-item.c buflist-bar-item.h + buflist-command.c buflist-command.h + buflist-config.c buflist-config.h + buflist-info.c buflist-info.h + buflist-mouse.c buflist-mouse.h +) set_target_properties(buflist PROPERTIES PREFIX "") target_link_libraries(buflist coverage_config) diff --git a/src/plugins/charset/CMakeLists.txt b/src/plugins/charset/CMakeLists.txt index 6a775f4be..2e54b00cf 100644 --- a/src/plugins/charset/CMakeLists.txt +++ b/src/plugins/charset/CMakeLists.txt @@ -17,7 +17,9 @@ # along with WeeChat. If not, see <https://www.gnu.org/licenses/>. # -add_library(charset MODULE charset.c) +add_library(charset MODULE + charset.c +) set_target_properties(charset PROPERTIES PREFIX "") if(ICONV_FOUND) diff --git a/src/plugins/exec/CMakeLists.txt b/src/plugins/exec/CMakeLists.txt index 44cd38dd3..35fff5942 100644 --- a/src/plugins/exec/CMakeLists.txt +++ b/src/plugins/exec/CMakeLists.txt @@ -18,11 +18,12 @@ # add_library(exec MODULE -exec.c exec.h -exec-buffer.c exec-buffer.h -exec-command.c exec-command.h -exec-completion.c exec-completion.h -exec-config.c exec-config.h) + exec.c exec.h + exec-buffer.c exec-buffer.h + exec-command.c exec-command.h + exec-completion.c exec-completion.h + exec-config.c exec-config.h +) set_target_properties(exec PROPERTIES PREFIX "") target_link_libraries(exec coverage_config) diff --git a/src/plugins/fifo/CMakeLists.txt b/src/plugins/fifo/CMakeLists.txt index f63bb6462..33a14ebf7 100644 --- a/src/plugins/fifo/CMakeLists.txt +++ b/src/plugins/fifo/CMakeLists.txt @@ -18,10 +18,11 @@ # add_library(fifo MODULE -fifo.c fifo.h -fifo-command.c fifo-command.h -fifo-config.c fifo-config.h -fifo-info.c fifo-info.h) + fifo.c fifo.h + fifo-command.c fifo-command.h + fifo-config.c fifo-config.h + fifo-info.c fifo-info.h +) set_target_properties(fifo PROPERTIES PREFIX "") target_link_libraries(fifo coverage_config) diff --git a/src/plugins/fset/CMakeLists.txt b/src/plugins/fset/CMakeLists.txt index 773f3bcc4..e807acc67 100644 --- a/src/plugins/fset/CMakeLists.txt +++ b/src/plugins/fset/CMakeLists.txt @@ -18,15 +18,16 @@ # add_library(fset MODULE -fset.c fset.h -fset-bar-item.c fset-bar-item.h -fset-buffer.c fset-buffer.h -fset-command.c fset-command.h -fset-completion.c fset-completion.h -fset-config.c fset-config.h -fset-info.c fset-info.h -fset-mouse.c fset-mouse.h -fset-option.c fset-option.h) + fset.c fset.h + fset-bar-item.c fset-bar-item.h + fset-buffer.c fset-buffer.h + fset-command.c fset-command.h + fset-completion.c fset-completion.h + fset-config.c fset-config.h + fset-info.c fset-info.h + fset-mouse.c fset-mouse.h + fset-option.c fset-option.h +) set_target_properties(fset PROPERTIES PREFIX "") target_link_libraries(fset coverage_config) diff --git a/src/plugins/guile/CMakeLists.txt b/src/plugins/guile/CMakeLists.txt index e8ddabc72..c08d63777 100644 --- a/src/plugins/guile/CMakeLists.txt +++ b/src/plugins/guile/CMakeLists.txt @@ -17,9 +17,10 @@ # along with WeeChat. If not, see <https://www.gnu.org/licenses/>. # -add_library(guile MODULE weechat-guile.c weechat-guile.h -weechat-guile-api.c weechat-guile-api.h) - +add_library(guile MODULE + weechat-guile.c weechat-guile.h + weechat-guile-api.c weechat-guile-api.h +) set_target_properties(guile PROPERTIES PREFIX "") if(GUILE_FOUND) diff --git a/src/plugins/irc/CMakeLists.txt b/src/plugins/irc/CMakeLists.txt index 7c6cef73e..a77698d78 100644 --- a/src/plugins/irc/CMakeLists.txt +++ b/src/plugins/irc/CMakeLists.txt @@ -18,31 +18,32 @@ # add_library(irc MODULE -irc.c irc.h -irc-bar-item.c irc-bar-item.h -irc-buffer.c irc-buffer.h -irc-channel.c irc-channel.h -irc-color.c irc-color.h -irc-command.c irc-command.h -irc-completion.c irc-completion.h -irc-config.c irc-config.h -irc-ctcp.c irc-ctcp.h -irc-debug.c irc-debug.h -irc-ignore.c irc-ignore.h -irc-info.c irc-info.h -irc-input.c irc-input.h -irc-message.c irc-message.h -irc-mode.c irc-mode.h -irc-modelist.c irc-modelist.h -irc-msgbuffer.c irc-msgbuffer.h -irc-nick.c irc-nick.h -irc-notify.c irc-notify.h -irc-protocol.c irc-protocol.h -irc-raw.c irc-raw.h -irc-redirect.c irc-redirect.h -irc-sasl.c irc-sasl.h -irc-server.c irc-server.h -irc-upgrade.c irc-upgrade.h) + irc.c irc.h + irc-bar-item.c irc-bar-item.h + irc-buffer.c irc-buffer.h + irc-channel.c irc-channel.h + irc-color.c irc-color.h + irc-command.c irc-command.h + irc-completion.c irc-completion.h + irc-config.c irc-config.h + irc-ctcp.c irc-ctcp.h + irc-debug.c irc-debug.h + irc-ignore.c irc-ignore.h + irc-info.c irc-info.h + irc-input.c irc-input.h + irc-message.c irc-message.h + irc-mode.c irc-mode.h + irc-modelist.c irc-modelist.h + irc-msgbuffer.c irc-msgbuffer.h + irc-nick.c irc-nick.h + irc-notify.c irc-notify.h + irc-protocol.c irc-protocol.h + irc-raw.c irc-raw.h + irc-redirect.c irc-redirect.h + irc-sasl.c irc-sasl.h + irc-server.c irc-server.h + irc-upgrade.c irc-upgrade.h +) set_target_properties(irc PROPERTIES PREFIX "") set(LINK_LIBS) diff --git a/src/plugins/javascript/CMakeLists.txt b/src/plugins/javascript/CMakeLists.txt index 37ebad3d5..2eed5d147 100644 --- a/src/plugins/javascript/CMakeLists.txt +++ b/src/plugins/javascript/CMakeLists.txt @@ -19,10 +19,11 @@ enable_language(CXX) -add_library(javascript MODULE weechat-js.cpp weechat-js.h -weechat-js-v8.cpp weechat-js-v8.h -weechat-js-api.cpp weechat-js-api.h) - +add_library(javascript MODULE + weechat-js.cpp weechat-js.h + weechat-js-v8.cpp weechat-js-v8.h + weechat-js-api.cpp weechat-js-api.h +) set_target_properties(javascript PROPERTIES PREFIX "") if(V8_FOUND) diff --git a/src/plugins/logger/CMakeLists.txt b/src/plugins/logger/CMakeLists.txt index 370017096..1e17228bf 100644 --- a/src/plugins/logger/CMakeLists.txt +++ b/src/plugins/logger/CMakeLists.txt @@ -18,13 +18,14 @@ # add_library(logger MODULE -logger.c logger.h -logger-backlog.c logger-backlog.h -logger-buffer.c logger-buffer.h -logger-command.c logger-command.h -logger-config.c logger-config.h -logger-info.c logger-info.h -logger-tail.c logger-tail.h) + logger.c logger.h + logger-backlog.c logger-backlog.h + logger-buffer.c logger-buffer.h + logger-command.c logger-command.h + logger-config.c logger-config.h + logger-info.c logger-info.h + logger-tail.c logger-tail.h +) set_target_properties(logger PROPERTIES PREFIX "") target_link_libraries(logger coverage_config) diff --git a/src/plugins/lua/CMakeLists.txt b/src/plugins/lua/CMakeLists.txt index 40dd0d216..f76167de2 100644 --- a/src/plugins/lua/CMakeLists.txt +++ b/src/plugins/lua/CMakeLists.txt @@ -18,9 +18,10 @@ # along with WeeChat. If not, see <https://www.gnu.org/licenses/>. # -add_library(lua MODULE weechat-lua.c weechat-lua.h weechat-lua-api.c -weechat-lua-api.h) - +add_library(lua MODULE + weechat-lua.c weechat-lua.h + weechat-lua-api.c weechat-lua-api.h +) set_target_properties(lua PROPERTIES PREFIX "") if(LUA_FOUND) diff --git a/src/plugins/perl/CMakeLists.txt b/src/plugins/perl/CMakeLists.txt index 78d8569c5..72734b48f 100644 --- a/src/plugins/perl/CMakeLists.txt +++ b/src/plugins/perl/CMakeLists.txt @@ -17,9 +17,10 @@ # along with WeeChat. If not, see <https://www.gnu.org/licenses/>. # -add_library(perl MODULE weechat-perl.c weechat-perl.h weechat-perl-api.c -weechat-perl-api.h) - +add_library(perl MODULE + weechat-perl.c weechat-perl.h + weechat-perl-api.c weechat-perl-api.h +) set_target_properties(perl PROPERTIES PREFIX "") if(PERL_FOUND) diff --git a/src/plugins/php/CMakeLists.txt b/src/plugins/php/CMakeLists.txt index 47f7564bb..376d300ea 100644 --- a/src/plugins/php/CMakeLists.txt +++ b/src/plugins/php/CMakeLists.txt @@ -17,9 +17,10 @@ # along with WeeChat. If not, see <https://www.gnu.org/licenses/>. # -add_library(php MODULE weechat-php.c weechat-php.h weechat-php-api.c -weechat-php-api.h) - +add_library(php MODULE + weechat-php.c weechat-php.h + weechat-php-api.c weechat-php-api.h +) set_target_properties(php PROPERTIES PREFIX "") if(PHP_FOUND) diff --git a/src/plugins/python/CMakeLists.txt b/src/plugins/python/CMakeLists.txt index 2229e551a..754a89c4e 100644 --- a/src/plugins/python/CMakeLists.txt +++ b/src/plugins/python/CMakeLists.txt @@ -17,9 +17,10 @@ # along with WeeChat. If not, see <https://www.gnu.org/licenses/>. # -add_library(python MODULE weechat-python.c weechat-python.h -weechat-python-api.c weechat-python-api.h) - +add_library(python MODULE + weechat-python.c weechat-python.h + weechat-python-api.c weechat-python-api.h +) set_target_properties(python PROPERTIES PREFIX "") if(PYTHON_FOUND) diff --git a/src/plugins/relay/CMakeLists.txt b/src/plugins/relay/CMakeLists.txt index a98545c79..757b8bebd 100644 --- a/src/plugins/relay/CMakeLists.txt +++ b/src/plugins/relay/CMakeLists.txt @@ -18,23 +18,24 @@ # add_library(relay MODULE -relay.c relay.h -relay-buffer.c relay-buffer.h -relay-client.c relay-client.h -irc/relay-irc.c irc/relay-irc.h -weechat/relay-weechat.c weechat/relay-weechat.h -weechat/relay-weechat-msg.c weechat/relay-weechat-msg.h -weechat/relay-weechat-nicklist.c weechat/relay-weechat-nicklist.h -weechat/relay-weechat-protocol.c weechat/relay-weechat-protocol.h -relay-command.c relay-command.h -relay-completion.c relay-completion.h -relay-config.c relay-config.h -relay-info.c relay-info.h -relay-network.c relay-network.h -relay-raw.c relay-raw.h -relay-server.c relay-server.h -relay-upgrade.c relay-upgrade.h -relay-websocket.c relay-websocket.h) + relay.c relay.h + relay-buffer.c relay-buffer.h + relay-client.c relay-client.h + irc/relay-irc.c irc/relay-irc.h + weechat/relay-weechat.c weechat/relay-weechat.h + weechat/relay-weechat-msg.c weechat/relay-weechat-msg.h + weechat/relay-weechat-nicklist.c weechat/relay-weechat-nicklist.h + weechat/relay-weechat-protocol.c weechat/relay-weechat-protocol.h + relay-command.c relay-command.h + relay-completion.c relay-completion.h + relay-config.c relay-config.h + relay-info.c relay-info.h + relay-network.c relay-network.h + relay-raw.c relay-raw.h + relay-server.c relay-server.h + relay-upgrade.c relay-upgrade.h + relay-websocket.c relay-websocket.h +) set_target_properties(relay PROPERTIES PREFIX "") set(LINK_LIBS) diff --git a/src/plugins/ruby/CMakeLists.txt b/src/plugins/ruby/CMakeLists.txt index b17c36802..8b4b08bfc 100644 --- a/src/plugins/ruby/CMakeLists.txt +++ b/src/plugins/ruby/CMakeLists.txt @@ -17,9 +17,10 @@ # along with WeeChat. If not, see <https://www.gnu.org/licenses/>. # -add_library(ruby MODULE weechat-ruby.c weechat-ruby.h weechat-ruby-api.c -weechat-ruby-api.h) - +add_library(ruby MODULE + weechat-ruby.c weechat-ruby.h + weechat-ruby-api.c weechat-ruby-api.h +) set_target_properties(ruby PROPERTIES PREFIX "") if(RUBY_FOUND) diff --git a/src/plugins/script/CMakeLists.txt b/src/plugins/script/CMakeLists.txt index 6b5701acd..0c83d0774 100644 --- a/src/plugins/script/CMakeLists.txt +++ b/src/plugins/script/CMakeLists.txt @@ -18,15 +18,16 @@ # add_library(script MODULE -script.c script.h -script-action.c script-action.h -script-buffer.c script-buffer.h -script-command.c script-command.h -script-completion.c script-completion.h -script-config.c script-config.h -script-info.c script-info.h -script-mouse.c script-mouse.h -script-repo.c script-repo.h) + script.c script.h + script-action.c script-action.h + script-buffer.c script-buffer.h + script-command.c script-command.h + script-completion.c script-completion.h + script-config.c script-config.h + script-info.c script-info.h + script-mouse.c script-mouse.h + script-repo.c script-repo.h +) set_target_properties(script PROPERTIES PREFIX "") set(LINK_LIBS) diff --git a/src/plugins/spell/CMakeLists.txt b/src/plugins/spell/CMakeLists.txt index 700aeb290..d27724311 100644 --- a/src/plugins/spell/CMakeLists.txt +++ b/src/plugins/spell/CMakeLists.txt @@ -19,13 +19,14 @@ # add_library(spell MODULE -spell.c spell.h -spell-bar-item.c spell-bar-item.h -spell-command.c spell-command.h -spell-completion.c spell-completion.h -spell-config.c spell-config.h -spell-info.c spell-info.h -spell-speller.c spell-speller.h) + spell.c spell.h + spell-bar-item.c spell-bar-item.h + spell-command.c spell-command.h + spell-completion.c spell-completion.h + spell-config.c spell-config.h + spell-info.c spell-info.h + spell-speller.c spell-speller.h +) set_target_properties(spell PROPERTIES PREFIX "") if(ENCHANT_FOUND) diff --git a/src/plugins/tcl/CMakeLists.txt b/src/plugins/tcl/CMakeLists.txt index c39e2106d..a159751a3 100644 --- a/src/plugins/tcl/CMakeLists.txt +++ b/src/plugins/tcl/CMakeLists.txt @@ -19,9 +19,10 @@ # along with WeeChat. If not, see <https://www.gnu.org/licenses/>. # -add_library(tcl MODULE weechat-tcl.c weechat-tcl.h -weechat-tcl-api.c weechat-tcl-api.h) - +add_library(tcl MODULE + weechat-tcl.c weechat-tcl.h + weechat-tcl-api.c weechat-tcl-api.h +) set_target_properties(tcl PROPERTIES PREFIX "") if(TCL_FOUND) diff --git a/src/plugins/trigger/CMakeLists.txt b/src/plugins/trigger/CMakeLists.txt index cda979e7a..a3b15a18d 100644 --- a/src/plugins/trigger/CMakeLists.txt +++ b/src/plugins/trigger/CMakeLists.txt @@ -18,12 +18,13 @@ # add_library(trigger MODULE -trigger.c trigger.h -trigger-buffer.c trigger-buffer.h -trigger-callback.c trigger-callback.h -trigger-command.c trigger-command.h -trigger-completion.c trigger-completion.h -trigger-config.c trigger-config.h) + trigger.c trigger.h + trigger-buffer.c trigger-buffer.h + trigger-callback.c trigger-callback.h + trigger-command.c trigger-command.h + trigger-completion.c trigger-completion.h + trigger-config.c trigger-config.h +) set_target_properties(trigger PROPERTIES PREFIX "") target_link_libraries(trigger coverage_config) diff --git a/src/plugins/xfer/CMakeLists.txt b/src/plugins/xfer/CMakeLists.txt index 6619a93ab..2ff3b9924 100644 --- a/src/plugins/xfer/CMakeLists.txt +++ b/src/plugins/xfer/CMakeLists.txt @@ -18,17 +18,18 @@ # add_library(xfer MODULE -xfer.c xfer.h -xfer-buffer.c xfer-buffer.h -xfer-chat.c xfer-chat.h -xfer-command.c xfer-command.h -xfer-completion.c xfer-completion.h -xfer-config.c xfer-config.h -xfer-dcc.c xfer-dcc.h -xfer-file.c xfer-file.h -xfer-info.c xfer-info.h -xfer-network.c xfer-network.h -xfer-upgrade.c xfer-upgrade.h) + xfer.c xfer.h + xfer-buffer.c xfer-buffer.h + xfer-chat.c xfer-chat.h + xfer-command.c xfer-command.h + xfer-completion.c xfer-completion.h + xfer-config.c xfer-config.h + xfer-dcc.c xfer-dcc.h + xfer-file.c xfer-file.h + xfer-info.c xfer-info.h + xfer-network.c xfer-network.h + xfer-upgrade.c xfer-upgrade.h +) set_target_properties(xfer PROPERTIES PREFIX "") set(LINK_LIBS) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 635b704c1..25be90be7 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -82,21 +82,25 @@ target_link_libraries(tests ${EXTRA_LIBS} ${CURL_LIBRARIES} ${CPPUTEST_LIBRARIES} - -rdynamic) + -rdynamic +) add_dependencies(tests weechat_core weechat_plugins weechat_gui_common weechat_gui_headless weechat_ncurses_fake - weechat_unit_tests_core) + weechat_unit_tests_core +) # test for cmake (ctest) add_test(NAME unit WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMAND tests -v) + COMMAND tests -v +) set_property(TEST unit PROPERTY ENVIRONMENT "WEECHAT_TESTS_ARGS=-p;" "WEECHAT_EXTRA_LIBDIR=${PROJECT_BINARY_DIR}/src;" "WEECHAT_TESTS_SCRIPTS_DIR=${CMAKE_CURRENT_SOURCE_DIR}/scripts/python" - "WEECHAT_TESTS_PLUGINS_LIB=${CMAKE_CURRENT_BINARY_DIR}/libweechat_unit_tests_plugins.so") + "WEECHAT_TESTS_PLUGINS_LIB=${CMAKE_CURRENT_BINARY_DIR}/libweechat_unit_tests_plugins.so" +) |