From d285169b9c1cbe98c85450003068aa9380d3f5d4 Mon Sep 17 00:00:00 2001 From: Mihael Pranjic Date: Tue, 27 Apr 2021 22:25:15 +0200 Subject: [PATCH] reformat cmake --- doc/CMakeLists.txt | 3 +-- scripts/cmake/ElektraCompiling.cmake | 2 +- scripts/cmake/ElektraCoverage.cmake | 12 ++++------ scripts/cmake/ElektraManPage.cmake | 6 ++--- scripts/cmake/Modules/FindGLib.cmake | 5 +++- scripts/cmake/Modules/FindLibGit2.cmake | 5 +++- scripts/cmake/Modules/FindLibOpenSSL.cmake | 6 +++-- scripts/cmake/Modules/FindLibgcrypt.cmake | 6 +++-- scripts/cmake/Modules/FindLua.cmake | 9 ++++--- scripts/cmake/Modules/FindPython2Interp.cmake | 5 +++- scripts/cmake/Modules/FindPython2Libs.cmake | 5 +++- scripts/cmake/Modules/FindXercesC.cmake | 24 +++++++------------ scripts/cmake/Modules/FindZeroMQ.cmake | 5 +++- scripts/cmake/Modules/Findlibuv.cmake | 5 +++- scripts/cmake/Modules/Findyaml-cpp.cmake | 5 +++- scripts/cmake/Modules/LibAddMacros.cmake | 20 ++++++++++++---- src/bindings/intercept/env/src/CMakeLists.txt | 6 +++-- src/bindings/jna/CMakeLists.txt | 5 +++- src/bindings/swig/lua/CMakeLists.txt | 9 +++---- src/bindings/swig/python/CMakeLists.txt | 18 +++++--------- src/bindings/swig/ruby/CMakeLists.txt | 18 +++++--------- src/libs/CMakeLists.txt | 3 +-- src/libs/elektra/CMakeLists.txt | 24 +++++++++++++------ src/libs/io/adapter/zeromq/CMakeLists.txt | 6 +++-- src/libs/tools/src/CMakeLists.txt | 24 ++++++++++++------- src/libs/tools/tests/CMakeLists.txt | 4 ++-- src/plugins/augeas/CMakeLists.txt | 3 ++- src/plugins/c/CMakeLists.txt | 4 +++- src/plugins/counter/CMakeLists.txt | 4 +++- src/plugins/cpptemplate/CMakeLists.txt | 6 +++-- src/plugins/dbusrecv/CMakeLists.txt | 5 +--- src/plugins/desktop/CMakeLists.txt | 4 +++- src/plugins/dpkg/CMakeLists.txt | 4 +++- src/plugins/dump/CMakeLists.txt | 4 +++- src/plugins/error/CMakeLists.txt | 4 +++- src/plugins/gopts/CMakeLists.txt | 6 +++-- src/plugins/logchange/CMakeLists.txt | 4 +++- src/plugins/noresolver/CMakeLists.txt | 4 +++- src/plugins/shell/CMakeLists.txt | 4 +++- src/plugins/sync/CMakeLists.txt | 4 +++- src/plugins/syslog/CMakeLists.txt | 4 +++- src/plugins/timeofday/CMakeLists.txt | 4 +++- src/plugins/tracer/CMakeLists.txt | 4 +++- src/plugins/wresolver/CMakeLists.txt | 4 +++- src/plugins/yamlcpp/CMakeLists.txt | 4 +--- src/tools/elektrad/CMakeLists.txt | 3 +-- tests/CMakeLists.txt | 5 +--- 47 files changed, 191 insertions(+), 137 deletions(-) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 27552a3827a..d2b013e6499 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -122,8 +122,7 @@ if (DOXYGEN_FOUND) add_custom_command ( OUTPUT ${DOCSET_PATH} COMMAND make - COMMAND - ${CMAKE_COMMAND} ARGS -D DOCSET_PATH=${DOCSET_PATH} -D ICON_PATH=${CMAKE_SOURCE_DIR}/doc/images/icon.png -P + COMMAND ${CMAKE_COMMAND} ARGS -D DOCSET_PATH=${DOCSET_PATH} -D ICON_PATH=${CMAKE_SOURCE_DIR}/doc/images/icon.png -P ${CMAKE_SOURCE_DIR}/scripts/cmake/ElektraDocSet.cmake DEPENDS ${OUTPUT_DIRECTORY}/html/index.html markdownlinkconverter WORKING_DIRECTORY ${OUTPUT_DIRECTORY}/html) diff --git a/scripts/cmake/ElektraCompiling.cmake b/scripts/cmake/ElektraCompiling.cmake index d29a95904d7..4fd313485be 100644 --- a/scripts/cmake/ElektraCompiling.cmake +++ b/scripts/cmake/ElektraCompiling.cmake @@ -44,7 +44,7 @@ else (ELEKTRA_SYMVER_SUPPORTED) set (ELEKTRA_SYMVER_COMMAND "") try_compile (ELEKTRA_VERSION_SCRIPT_SUPPORTED ${CMAKE_BINARY_DIR}/src/symvertest/build ${CMAKE_SOURCE_DIR}/src/symvertest - symvertest basic) + symvertest basic) if (ELEKTRA_VERSION_SCRIPT_SUPPORTED) set (LD_ACCEPTS_VERSION_SCRIPT TRUE) else (ELEKTRA_VERSION_SCRIPT_SUPPORTED) diff --git a/scripts/cmake/ElektraCoverage.cmake b/scripts/cmake/ElektraCoverage.cmake index f44f4b1eca7..2534378409f 100644 --- a/scripts/cmake/ElektraCoverage.cmake +++ b/scripts/cmake/ElektraCoverage.cmake @@ -21,17 +21,14 @@ if (EXISTS ${COVERAGE_LCOV} AND EXISTS ${COVERAGE_AWK}) add_custom_target ( coverage-start COMMAND ${COVERAGE_LCOV} ${COMMON_FLAGS} --directory . --zerocounters - COMMAND - ${COVERAGE_LCOV} ${COMMON_FLAGS} --directory . --initial --capture --output-file ${COVERAGE_DIR}/coverage-base.info + COMMAND ${COVERAGE_LCOV} ${COMMON_FLAGS} --directory . --initial --capture --output-file ${COVERAGE_DIR}/coverage-base.info WORKING_DIRECTORY ${PROJECT_BINARY_DIR} COMMENT "Start capturing data for coverage.") add_custom_target ( coverage-stop - COMMAND - ${COVERAGE_LCOV} ${COMMON_FLAGS} --directory . --capture --output-file ${COVERAGE_DIR}/coverage-test.info - COMMAND - ${COVERAGE_LCOV} ${COMMON_FLAGS} --add-tracefile ${COVERAGE_DIR}/coverage-test.info --add-tracefile + COMMAND ${COVERAGE_LCOV} ${COMMON_FLAGS} --directory . --capture --output-file ${COVERAGE_DIR}/coverage-test.info + COMMAND ${COVERAGE_LCOV} ${COMMON_FLAGS} --add-tracefile ${COVERAGE_DIR}/coverage-test.info --add-tracefile ${COVERAGE_DIR}/coverage-base.info --output-file ${COVERAGE_DIR}/coverage.info COMMAND ${COVERAGE_AWK} -f "${COVERAGE_FILTER}" ${COVERAGE_DIR}/coverage.info > ${COVERAGE_DIR}/coverage-filtered.info WORKING_DIRECTORY ${PROJECT_BINARY_DIR} @@ -41,8 +38,7 @@ if (EXISTS ${COVERAGE_LCOV} AND EXISTS ${COVERAGE_AWK}) if (EXISTS ${COVERAGE_GENHTML}) add_custom_target ( coverage-genhtml - COMMAND - ${COVERAGE_GENHTML} ${COMMON_FLAGS} ${COVERAGE_DIR}/coverage-filtered.info --prefix "${COVERAGE_PREFIX}" + COMMAND ${COVERAGE_GENHTML} ${COMMON_FLAGS} ${COVERAGE_DIR}/coverage-filtered.info --prefix "${COVERAGE_PREFIX}" --output-directory ${COVERAGE_DIR} WORKING_DIRECTORY ${PROJECT_BINARY_DIR} COMMENT "Create html statistics of data for coverage.") diff --git a/scripts/cmake/ElektraManPage.cmake b/scripts/cmake/ElektraManPage.cmake index b0c796fd8a9..05167d10a0b 100644 --- a/scripts/cmake/ElektraManPage.cmake +++ b/scripts/cmake/ElektraManPage.cmake @@ -4,10 +4,8 @@ if (EXISTS "${MANPAGE}" AND DIFF_COMMAND) execute_process (COMMAND ${CMAKE_COMMAND} -E copy ${MANPAGE} ${OLD_MAN_PAGE_COPY}) endif (EXISTS "${MANPAGE}" AND DIFF_COMMAND) -execute_process ( - COMMAND - ${CMAKE_COMMAND} -E env RUBYOPT=-Eutf-8:utf-8 LC_ALL=C.utf-8 ${RONN_COMMAND} -r --pipe ${MDFILE} - OUTPUT_FILE ${MANPAGE}) +execute_process (COMMAND ${CMAKE_COMMAND} -E env RUBYOPT=-Eutf-8:utf-8 LC_ALL=C.utf-8 ${RONN_COMMAND} -r --pipe ${MDFILE} + OUTPUT_FILE ${MANPAGE}) if (NOT EXISTS "${OLD_MAN_PAGE_COPY}") return () diff --git a/scripts/cmake/Modules/FindGLib.cmake b/scripts/cmake/Modules/FindGLib.cmake index 713da47f31c..4041fb450f8 100644 --- a/scripts/cmake/Modules/FindGLib.cmake +++ b/scripts/cmake/Modules/FindGLib.cmake @@ -63,4 +63,7 @@ if (GLib_LIBRARY AND NOT GLib_FOUND) endif () include (FindPackageHandleStandardArgs) -find_package_handle_standard_args (GLib REQUIRED_VARS GLib_LIBRARY GLib_INCLUDE_DIRS VERSION_VAR GLib_VERSION) +find_package_handle_standard_args ( + GLib + REQUIRED_VARS GLib_LIBRARY GLib_INCLUDE_DIRS + VERSION_VAR GLib_VERSION) diff --git a/scripts/cmake/Modules/FindLibGit2.cmake b/scripts/cmake/Modules/FindLibGit2.cmake index c5295dbe6e5..66b7b81a34a 100644 --- a/scripts/cmake/Modules/FindLibGit2.cmake +++ b/scripts/cmake/Modules/FindLibGit2.cmake @@ -21,7 +21,10 @@ if (NOT LibGit2_VERSION_HEADER STREQUAL LibGit2_VERSION_HEADER-NOTFOUND) endif (NOT LibGit2_VERSION_HEADER STREQUAL LibGit2_VERSION_HEADER-NOTFOUND) include (FindPackageHandleStandardArgs) -find_package_handle_standard_args (LibGit2 REQUIRED_VARS LibGit2_LIBRARIES LibGit2_INCLUDE_DIR VERSION_VAR LibGit2_VERSION) +find_package_handle_standard_args ( + LibGit2 + REQUIRED_VARS LibGit2_LIBRARIES LibGit2_INCLUDE_DIR + VERSION_VAR LibGit2_VERSION) mark_as_advanced (LibGit2_INCLUDE_DIR LibGit2_LIBRARIES) diff --git a/scripts/cmake/Modules/FindLibOpenSSL.cmake b/scripts/cmake/Modules/FindLibOpenSSL.cmake index df7cddebac2..9dc5bb7680f 100644 --- a/scripts/cmake/Modules/FindLibOpenSSL.cmake +++ b/scripts/cmake/Modules/FindLibOpenSSL.cmake @@ -45,8 +45,10 @@ endif () if (OPENSSL_FOUND) # try to compile and link a minimal sample program against libcrypto - try_compile (HAS_OPENSSL_4SURE "${CMAKE_BINARY_DIR}" "${PROJECT_SOURCE_DIR}/src/plugins/crypto/compile_openssl.c" - CMAKE_FLAGS -DINCLUDE_DIRECTORIES:STRING=${OPENSSL_INCLUDE_DIR} -DLINK_LIBRARIES:PATH=${OPENSSL_LIBRARIES}) + try_compile ( + HAS_OPENSSL_4SURE "${CMAKE_BINARY_DIR}" + "${PROJECT_SOURCE_DIR}/src/plugins/crypto/compile_openssl.c" + CMAKE_FLAGS -DINCLUDE_DIRECTORIES:STRING=${OPENSSL_INCLUDE_DIR} -DLINK_LIBRARIES:PATH=${OPENSSL_LIBRARIES}) if (NOT HAS_OPENSSL_4SURE) message (STATUS "OpenSSL compile/linker test failed") diff --git a/scripts/cmake/Modules/FindLibgcrypt.cmake b/scripts/cmake/Modules/FindLibgcrypt.cmake index 2145b2a7928..5c06dd240de 100644 --- a/scripts/cmake/Modules/FindLibgcrypt.cmake +++ b/scripts/cmake/Modules/FindLibgcrypt.cmake @@ -21,8 +21,10 @@ set (Libgcrypt_INCLUDE_DIRS ${Libgcrypt_INCLUDE_DIR}) if (Libgcrypt_FOUND) # Try to compile and link a minimal sample program against libgcrypt - try_compile (HAS_GCRYPT_4SURE ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/src/plugins/crypto/compile_gcrypt.c - CMAKE_FLAGS -DINCLUDE_DIRECTORIES:STRING=${Libgcrypt_INCLUDE_DIRS} -DLINK_LIBRARIES:PATH=${Libgcrypt_LIBRARIES}) + try_compile ( + HAS_GCRYPT_4SURE ${CMAKE_BINARY_DIR} + ${PROJECT_SOURCE_DIR}/src/plugins/crypto/compile_gcrypt.c + CMAKE_FLAGS -DINCLUDE_DIRECTORIES:STRING=${Libgcrypt_INCLUDE_DIRS} -DLINK_LIBRARIES:PATH=${Libgcrypt_LIBRARIES}) if (NOT HAS_GCRYPT_4SURE) message (STATUS "libgcrypt compile/linker test failed. Please check if all library and include paths are set properly!") diff --git a/scripts/cmake/Modules/FindLua.cmake b/scripts/cmake/Modules/FindLua.cmake index e9f815e72a4..b0981484856 100644 --- a/scripts/cmake/Modules/FindLua.cmake +++ b/scripts/cmake/Modules/FindLua.cmake @@ -203,9 +203,9 @@ function (set_lua_version_vars) foreach (ver IN LISTS lua_append_versions) string (REGEX MATCH "^([0-9]+)\\.([0-9]+)$" _ver "${ver}") list (APPEND _lua_include_subdirs include/lua${CMAKE_MATCH_1}${CMAKE_MATCH_2} include/lua${CMAKE_MATCH_1}.${CMAKE_MATCH_2} - include/lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2}) + include/lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2}) list (APPEND _lua_library_names lua${CMAKE_MATCH_1}${CMAKE_MATCH_2} lua${CMAKE_MATCH_1}.${CMAKE_MATCH_2} - lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2}) + lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2}) endforeach () set ( @@ -329,6 +329,9 @@ verify_lua_executable_version () # LUA_VERSION_STRING available from here include (FindPackageHandleStandardArgs) # handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if all listed variables are TRUE -find_package_handle_standard_args (Lua REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR VERSION_VAR LUA_VERSION_STRING) +find_package_handle_standard_args ( + Lua + REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR + VERSION_VAR LUA_VERSION_STRING) mark_as_advanced (LUA_INCLUDE_DIR LUA_LIBRARY LUA_MATH_LIBRARY) diff --git a/scripts/cmake/Modules/FindPython2Interp.cmake b/scripts/cmake/Modules/FindPython2Interp.cmake index 41bc10c2b00..cbb52436977 100644 --- a/scripts/cmake/Modules/FindPython2Interp.cmake +++ b/scripts/cmake/Modules/FindPython2Interp.cmake @@ -253,6 +253,9 @@ endif (PYTHON2_EXECUTABLE) # handle the QUIETLY and REQUIRED arguments and set PYTHON2INTERP_FOUND to TRUE if all listed variables are TRUE include (FindPackageHandleStandardArgs) -find_package_handle_standard_args (Python2Interp REQUIRED_VARS PYTHON2_EXECUTABLE VERSION_VAR PYTHON2_VERSION_STRING) +find_package_handle_standard_args ( + Python2Interp + REQUIRED_VARS PYTHON2_EXECUTABLE + VERSION_VAR PYTHON2_VERSION_STRING) mark_as_advanced (PYTHON2_EXECUTABLE) diff --git a/scripts/cmake/Modules/FindPython2Libs.cmake b/scripts/cmake/Modules/FindPython2Libs.cmake index 6e26276e6a2..4dfeb768ed7 100644 --- a/scripts/cmake/Modules/FindPython2Libs.cmake +++ b/scripts/cmake/Modules/FindPython2Libs.cmake @@ -296,7 +296,10 @@ select_library_configurations (PYTHON2) unset (PYTHON2_FOUND) include (FindPackageHandleStandardArgs) -find_package_handle_standard_args (Python2Libs REQUIRED_VARS PYTHON2_LIBRARIES PYTHON2_INCLUDE_DIRS VERSION_VAR PYTHON2LIBS_VERSION_STRING) +find_package_handle_standard_args ( + Python2Libs + REQUIRED_VARS PYTHON2_LIBRARIES PYTHON2_INCLUDE_DIRS + VERSION_VAR PYTHON2LIBS_VERSION_STRING) # PYTHON2_ADD_MODULE( src1 src2 ... srcN) is used to build modules for python. PYTHON2_WRITE_MODULES_HEADER() writes a # header file you can include in your sources to initialize the static python modules diff --git a/scripts/cmake/Modules/FindXercesC.cmake b/scripts/cmake/Modules/FindXercesC.cmake index 34bae796f2e..66ec9870dfb 100644 --- a/scripts/cmake/Modules/FindXercesC.cmake +++ b/scripts/cmake/Modules/FindXercesC.cmake @@ -105,16 +105,10 @@ endif () include (FindPackageHandleStandardArgs) find_package_handle_standard_args ( XercesC - FOUND_VAR - XercesC_FOUND - REQUIRED_VARS - XercesC_LIBRARY - XercesC_INCLUDE_DIR - XercesC_VERSION - VERSION_VAR - XercesC_VERSION - FAIL_MESSAGE - "Failed to find XercesC") + FOUND_VAR XercesC_FOUND + REQUIRED_VARS XercesC_LIBRARY XercesC_INCLUDE_DIR XercesC_VERSION + VERSION_VAR XercesC_VERSION + FAIL_MESSAGE "Failed to find XercesC") if (XercesC_FOUND) set (XercesC_INCLUDE_DIRS "${XercesC_INCLUDE_DIR}") @@ -135,18 +129,16 @@ if (XercesC_FOUND) TARGET XercesC::XercesC APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) - set_target_properties ( - XercesC::XercesC PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX" IMPORTED_LOCATION_DEBUG - "${XercesC_LIBRARY_DEBUG}") + set_target_properties (XercesC::XercesC PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX" + IMPORTED_LOCATION_DEBUG "${XercesC_LIBRARY_DEBUG}") endif () if (EXISTS "${XercesC_LIBRARY_RELEASE}") set_property ( TARGET XercesC::XercesC APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) - set_target_properties ( - XercesC::XercesC PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX" IMPORTED_LOCATION_RELEASE - "${XercesC_LIBRARY_RELEASE}") + set_target_properties (XercesC::XercesC PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX" + IMPORTED_LOCATION_RELEASE "${XercesC_LIBRARY_RELEASE}") endif () endif () endif () diff --git a/scripts/cmake/Modules/FindZeroMQ.cmake b/scripts/cmake/Modules/FindZeroMQ.cmake index c294a6522be..ccb51f3a210 100644 --- a/scripts/cmake/Modules/FindZeroMQ.cmake +++ b/scripts/cmake/Modules/FindZeroMQ.cmake @@ -47,7 +47,10 @@ if (EXISTS ${ZeroMQ_VERSION_HEADER}) endif (EXISTS ${ZeroMQ_VERSION_HEADER}) include (FindPackageHandleStandardArgs) -find_package_handle_standard_args (ZeroMQ REQUIRED_VARS ZeroMQ_LIBRARY ZeroMQ_INCLUDE_DIR VERSION_VAR ZeroMQ_VERSION) +find_package_handle_standard_args ( + ZeroMQ + REQUIRED_VARS ZeroMQ_LIBRARY ZeroMQ_INCLUDE_DIR + VERSION_VAR ZeroMQ_VERSION) mark_as_advanced (ZeroMQ_INCLUDE_DIR ZeroMQ_LIBRARY ZeroMQ_VERSION) diff --git a/scripts/cmake/Modules/Findlibuv.cmake b/scripts/cmake/Modules/Findlibuv.cmake index 362100af9bc..153ca1ac9c2 100644 --- a/scripts/cmake/Modules/Findlibuv.cmake +++ b/scripts/cmake/Modules/Findlibuv.cmake @@ -47,7 +47,10 @@ if (NOT libuv_VERSION_HEADER STREQUAL libuv_VERSION_HEADER-NOTFOUND) endif (NOT libuv_VERSION_HEADER STREQUAL libuv_VERSION_HEADER-NOTFOUND) include (FindPackageHandleStandardArgs) -find_package_handle_standard_args (libuv REQUIRED_VARS libuv_LIBRARY libuv_INCLUDE_DIR VERSION_VAR libuv_VERSION) +find_package_handle_standard_args ( + libuv + REQUIRED_VARS libuv_LIBRARY libuv_INCLUDE_DIR + VERSION_VAR libuv_VERSION) mark_as_advanced (libuv_INCLUDE_DIR libuv_LIBRARY libuv_VERSION) diff --git a/scripts/cmake/Modules/Findyaml-cpp.cmake b/scripts/cmake/Modules/Findyaml-cpp.cmake index bdbdee23456..423ca465ef2 100644 --- a/scripts/cmake/Modules/Findyaml-cpp.cmake +++ b/scripts/cmake/Modules/Findyaml-cpp.cmake @@ -33,7 +33,10 @@ set (yaml-cpp_VERSION ${PC_yaml-cpp_VERSION}) include (FindPackageHandleStandardArgs) # Handle the QUIETLY and REQUIRED arguments and set yaml-cpp_FOUND to TRUE, if all listed variables are TRUE -find_package_handle_standard_args (yaml-cpp REQUIRED_VARS yaml-cpp_LIBRARY yaml-cpp_INCLUDE_DIR VERSION_VAR yaml-cpp_VERSION) +find_package_handle_standard_args ( + yaml-cpp + REQUIRED_VARS yaml-cpp_LIBRARY yaml-cpp_INCLUDE_DIR + VERSION_VAR yaml-cpp_VERSION) mark_as_advanced (yaml-cpp_INCLUDE_DIR yaml-cpp_LIBRARY yaml-cpp_VERSION) diff --git a/scripts/cmake/Modules/LibAddMacros.cmake b/scripts/cmake/Modules/LibAddMacros.cmake index eed08cfcd80..18f0aff4fc5 100644 --- a/scripts/cmake/Modules/LibAddMacros.cmake +++ b/scripts/cmake/Modules/LibAddMacros.cmake @@ -66,7 +66,11 @@ macro (create_lib_symlink src dest component) endif () " COMPONENT "${component}") -endmacro (create_lib_symlink src dest component) +endmacro ( + create_lib_symlink + src + dest + component) # ~~~ # Create a symlink for man1 files at installation @@ -109,7 +113,11 @@ macro (create_doc_symlink src dest component) endif () " COMPONENT "${component}") -endmacro (create_doc_symlink src dest component) +endmacro ( + create_doc_symlink + src + dest + component) # ~~~ # Make a directory @@ -252,7 +260,10 @@ function (find_util util output_loc output_arg) ${output_arg} ${ARG_LOC} PARENT_SCOPE) -endfunction (find_util util output) +endfunction ( + find_util + util + output) # ~~~ # - Adds all headerfiles of global include path to the given variable @@ -634,8 +645,7 @@ function (generate_manpage NAME) add_custom_command ( OUTPUT ${OUTFILE} DEPENDS ${MDFILE} - COMMAND - ${CMAKE_COMMAND} ARGS -D RONN_COMMAND=${RONN_LOC} -D DIFF_COMMAND=${DIFF_COMMAND} -D + COMMAND ${CMAKE_COMMAND} ARGS -D RONN_COMMAND=${RONN_LOC} -D DIFF_COMMAND=${DIFF_COMMAND} -D MDFILE=${MDFILE} -D MANPAGE=${OUTFILE} -P ${CMAKE_SOURCE_DIR}/scripts/cmake/ElektraManPage.cmake) add_custom_target (man-${NAME} ALL DEPENDS ${OUTFILE}) add_dependencies (man man-${NAME}) diff --git a/src/bindings/intercept/env/src/CMakeLists.txt b/src/bindings/intercept/env/src/CMakeLists.txt index 7f74b47317b..7b37209bc96 100644 --- a/src/bindings/intercept/env/src/CMakeLists.txt +++ b/src/bindings/intercept/env/src/CMakeLists.txt @@ -14,8 +14,10 @@ target_link_libraries (elektraintercept-env elektra-kdb elektra-meta) # must be set_target_properties ( elektraintercept-env - PROPERTIES COMPILE_DEFINITIONS "HAVE_KDBCONFIG_H" VERSION ${KDB_VERSION} SOVERSION ${SO_VERSION_GETENV} CLEAN_DIRECT_OUTPUT 1 - + PROPERTIES COMPILE_DEFINITIONS "HAVE_KDBCONFIG_H" + VERSION ${KDB_VERSION} + SOVERSION ${SO_VERSION_GETENV} + CLEAN_DIRECT_OUTPUT 1 LINKER_LANGUAGE CXX) install ( diff --git a/src/bindings/jna/CMakeLists.txt b/src/bindings/jna/CMakeLists.txt index 5095e7e8a8e..dd78d44534c 100644 --- a/src/bindings/jna/CMakeLists.txt +++ b/src/bindings/jna/CMakeLists.txt @@ -13,7 +13,10 @@ macro (java_test_needs_plugin test plugin) if (plugin_index GREATER -1) java_exclude_test (${test}) endif (plugin_index GREATER -1) -endmacro (java_test_needs_plugin test plugin) +endmacro ( + java_test_needs_plugin + test + plugin) if (Java_JAVAC_EXECUTABLE) diff --git a/src/bindings/swig/lua/CMakeLists.txt b/src/bindings/swig/lua/CMakeLists.txt index e712967060d..64f78f14758 100644 --- a/src/bindings/swig/lua/CMakeLists.txt +++ b/src/bindings/swig/lua/CMakeLists.txt @@ -29,12 +29,9 @@ else () else (CMAKE_VERSION VERSION_LESS 3.8) swig_add_library ( swig-lua - LANGUAGE - lua - SOURCES - kdb.i - TYPE - MODULE) + LANGUAGE lua + SOURCES kdb.i + TYPE MODULE) endif (CMAKE_VERSION VERSION_LESS 3.8) swig_link_libraries (swig-lua elektra-core elektra-kdb ${LUA_LIBRARIES}) set_target_properties (swig-lua PROPERTIES OUTPUT_NAME kdb) diff --git a/src/bindings/swig/python/CMakeLists.txt b/src/bindings/swig/python/CMakeLists.txt index 6c1fc4e28f5..8304c459aff 100644 --- a/src/bindings/swig/python/CMakeLists.txt +++ b/src/bindings/swig/python/CMakeLists.txt @@ -70,12 +70,9 @@ else () else (CMAKE_VERSION VERSION_LESS 3.8) swig_add_library ( swig-python - LANGUAGE - python - SOURCES - kdb.i - TYPE - MODULE) + LANGUAGE python + SOURCES kdb.i + TYPE MODULE) endif (CMAKE_VERSION VERSION_LESS 3.8) swig_link_libraries (swig-python elektra-core elektra-kdb ${PYTHON_LIBRARIES}) set_target_properties (_swig-python PROPERTIES OUTPUT_NAME _kdb) @@ -104,12 +101,9 @@ else () else (CMAKE_VERSION VERSION_LESS 3.8) swig_add_library ( swig-python-tools - LANGUAGE - python - SOURCES - tools.i - TYPE - MODULE) + LANGUAGE python + SOURCES tools.i + TYPE MODULE) endif (CMAKE_VERSION VERSION_LESS 3.8) swig_link_libraries (swig-python-tools elektratools ${PYTHON_LIBRARIES}) set_target_properties (_swig-python-tools PROPERTIES OUTPUT_NAME _tools) diff --git a/src/bindings/swig/ruby/CMakeLists.txt b/src/bindings/swig/ruby/CMakeLists.txt index dad6ebf76c2..b12e6fe25da 100644 --- a/src/bindings/swig/ruby/CMakeLists.txt +++ b/src/bindings/swig/ruby/CMakeLists.txt @@ -100,12 +100,9 @@ else () else (CMAKE_VERSION VERSION_LESS 3.8) swig_add_library ( swig-ruby - LANGUAGE - ruby - SOURCES - kdb.i - TYPE - MODULE) + LANGUAGE ruby + SOURCES kdb.i + TYPE MODULE) endif (CMAKE_VERSION VERSION_LESS 3.8) # set the compiler settings for the generated file (has to be done for each module # separately) set_source_files_properties (${swig_generated_file_fullname} PROPERTIES COMPILE_FLAGS "${SWIG_COMPILE_FLAGS}") @@ -116,12 +113,9 @@ else () else (CMAKE_VERSION VERSION_LESS 3.8) swig_add_library ( swig-ruby-tools - LANGUAGE - ruby - SOURCES - kdbtools.i - TYPE - MODULE) + LANGUAGE ruby + SOURCES kdbtools.i + TYPE MODULE) endif (CMAKE_VERSION VERSION_LESS 3.8) set_source_files_properties (${swig_generated_file_fullname} PROPERTIES COMPILE_FLAGS "${SWIG_COMPILE_FLAGS}") diff --git a/src/libs/CMakeLists.txt b/src/libs/CMakeLists.txt index fd61370d1c1..924a5caad6c 100644 --- a/src/libs/CMakeLists.txt +++ b/src/libs/CMakeLists.txt @@ -29,8 +29,7 @@ list (INSERT SUBDIRS 0 tools) add_custom_command ( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/symbols.map" - COMMAND - awk 1 ${SYM_MAPS} | awk -v vfile=versions.def -f version_gen.awk > "${CMAKE_CURRENT_BINARY_DIR}/symbols.map" + COMMAND awk 1 ${SYM_MAPS} | awk -v vfile=versions.def -f version_gen.awk > "${CMAKE_CURRENT_BINARY_DIR}/symbols.map" WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" DEPENDS version_gen.awk versions.def ${SYM_MAPS} COMMENT "Creating version script" diff --git a/src/libs/elektra/CMakeLists.txt b/src/libs/elektra/CMakeLists.txt index 936c6383ebe..158deab1b27 100644 --- a/src/libs/elektra/CMakeLists.txt +++ b/src/libs/elektra/CMakeLists.txt @@ -90,8 +90,10 @@ if (BUILD_SHARED) set (elektra-all_LIBRARIES elektra-core elektra-kdb ${elektra-extension_LIBRARIES}) set_target_properties ( ${elektra-all_LIBRARIES} - PROPERTIES COMPILE_DEFINITIONS "HAVE_KDBCONFIG_H" VERSION ${KDB_VERSION} SOVERSION ${SO_VERSION} CLEAN_DIRECT_OUTPUT 1 - + PROPERTIES COMPILE_DEFINITIONS "HAVE_KDBCONFIG_H" + VERSION ${KDB_VERSION} + SOVERSION ${SO_VERSION} + CLEAN_DIRECT_OUTPUT 1 LINK_DEPENDS "${__symbols_file}") if (${LD_ACCEPTS_VERSION_SCRIPT}) @@ -140,8 +142,13 @@ if (BUILD_FULL) target_link_libraries (elektra-full ${elektra-full_LIBRARIES}) set_target_properties ( - elektra-full PROPERTIES COMPILE_DEFINITIONS "HAVE_KDBCONFIG_H;ELEKTRA_STATIC" VERSION ${KDB_VERSION} - SOVERSION ${SO_VERSION} CLEAN_DIRECT_OUTPUT 1 LINKER_LANGUAGE CXX LINK_DEPENDS "${__symbols_file}") + elektra-full + PROPERTIES COMPILE_DEFINITIONS "HAVE_KDBCONFIG_H;ELEKTRA_STATIC" + VERSION ${KDB_VERSION} + SOVERSION ${SO_VERSION} + CLEAN_DIRECT_OUTPUT 1 + LINKER_LANGUAGE CXX + LINK_DEPENDS "${__symbols_file}") if (${LD_ACCEPTS_VERSION_SCRIPT}) set_target_properties (elektra-full PROPERTIES LINK_FLAGS "-Wl,--version-script='${__symbols_file}'") endif () @@ -164,9 +171,12 @@ if (BUILD_STATIC) set_target_properties ( elektra-static - PROPERTIES COMPILE_DEFINITIONS "HAVE_KDBCONFIG_H;ELEKTRA_STATIC" VERSION ${KDB_VERSION} SOVERSION ${SO_VERSION} - - CLEAN_DIRECT_OUTPUT 1 LINKER_LANGUAGE CXX LINK_DEPENDS "${__symbols_file}") + PROPERTIES COMPILE_DEFINITIONS "HAVE_KDBCONFIG_H;ELEKTRA_STATIC" + VERSION ${KDB_VERSION} + SOVERSION ${SO_VERSION} + CLEAN_DIRECT_OUTPUT 1 + LINKER_LANGUAGE CXX + LINK_DEPENDS "${__symbols_file}") if (${LD_ACCEPTS_VERSION_SCRIPT}) set_target_properties (elektra-static PROPERTIES LINK_FLAGS "-Wl,--version-script='${__symbols_file}'") endif () diff --git a/src/libs/io/adapter/zeromq/CMakeLists.txt b/src/libs/io/adapter/zeromq/CMakeLists.txt index 139f307d4c6..05776779d0f 100644 --- a/src/libs/io/adapter/zeromq/CMakeLists.txt +++ b/src/libs/io/adapter/zeromq/CMakeLists.txt @@ -4,8 +4,10 @@ find_package (ZeroMQ QUIET) if (ZeroMQ_FOUND) - try_compile (CAN_LINK_ZMQ "${CMAKE_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/try_compile_zeromq.c" - CMAKE_FLAGS -DINCLUDE_DIRECTORIES:STRING=${ZeroMQ_INCLUDE_DIRS} -DLINK_LIBRARIES:PATH=${ZeroMQ_LIBRARIES}) + try_compile ( + CAN_LINK_ZMQ "${CMAKE_BINARY_DIR}" + "${CMAKE_CURRENT_SOURCE_DIR}/try_compile_zeromq.c" + CMAKE_FLAGS -DINCLUDE_DIRECTORIES:STRING=${ZeroMQ_INCLUDE_DIRS} -DLINK_LIBRARIES:PATH=${ZeroMQ_LIBRARIES}) if (NOT CAN_LINK_ZMQ) message ( diff --git a/src/libs/tools/src/CMakeLists.txt b/src/libs/tools/src/CMakeLists.txt index 185f8d11e64..5a17b10ca83 100644 --- a/src/libs/tools/src/CMakeLists.txt +++ b/src/libs/tools/src/CMakeLists.txt @@ -27,9 +27,11 @@ if (BUILD_SHARED) set_target_properties ( elektratools - PROPERTIES COMPILE_DEFINITIONS "HAVE_KDBCONFIG_H;ELEKTRA_SHARED" VERSION ${KDB_VERSION} SOVERSION ${SO_VERSION_TOOLS} - - CLEAN_DIRECT_OUTPUT 1 LINKER_LANGUAGE CXX) + PROPERTIES COMPILE_DEFINITIONS "HAVE_KDBCONFIG_H;ELEKTRA_SHARED" + VERSION ${KDB_VERSION} + SOVERSION ${SO_VERSION_TOOLS} + CLEAN_DIRECT_OUTPUT 1 + LINKER_LANGUAGE CXX) if (${LD_ACCEPTS_VERSION_SCRIPT}) set_target_properties (elektratools PROPERTIES LINK_FLAGS "-Wl,--version-script='${__symbols_file}'") @@ -48,9 +50,11 @@ if (BUILD_FULL) set_target_properties ( elektratools-full - PROPERTIES COMPILE_DEFINITIONS "HAVE_KDBCONFIG_H;ELEKTRA_STATIC" VERSION ${KDB_VERSION} SOVERSION ${SO_VERSION_TOOLS} - - CLEAN_DIRECT_OUTPUT 1 LINKER_LANGUAGE CXX) + PROPERTIES COMPILE_DEFINITIONS "HAVE_KDBCONFIG_H;ELEKTRA_STATIC" + VERSION ${KDB_VERSION} + SOVERSION ${SO_VERSION_TOOLS} + CLEAN_DIRECT_OUTPUT 1 + LINKER_LANGUAGE CXX) if (${LD_ACCEPTS_VERSION_SCRIPT}) set_target_properties (elektratools-full PROPERTIES LINK_FLAGS "-Wl,--version-script='${__symbols_file}'") @@ -69,9 +73,11 @@ if (BUILD_STATIC) set_target_properties ( elektratools-static - PROPERTIES COMPILE_DEFINITIONS "HAVE_KDBCONFIG_H;ELEKTRA_STATIC" VERSION ${KDB_VERSION} SOVERSION ${SO_VERSION_TOOLS} - - CLEAN_DIRECT_OUTPUT 1 LINKER_LANGUAGE CXX) + PROPERTIES COMPILE_DEFINITIONS "HAVE_KDBCONFIG_H;ELEKTRA_STATIC" + VERSION ${KDB_VERSION} + SOVERSION ${SO_VERSION_TOOLS} + CLEAN_DIRECT_OUTPUT 1 + LINKER_LANGUAGE CXX) set_target_properties (elektratools-static PROPERTIES LINKER_LANGUAGE CXX) if (${LD_ACCEPTS_VERSION_SCRIPT}) diff --git a/src/libs/tools/tests/CMakeLists.txt b/src/libs/tools/tests/CMakeLists.txt index de22654fcec..bd5c783fd93 100644 --- a/src/libs/tools/tests/CMakeLists.txt +++ b/src/libs/tools/tests/CMakeLists.txt @@ -21,8 +21,8 @@ file (GLOB TESTS testtool_*.cpp) # - https://github.com/ElektraInitiative/libelektra/commit/15d67328 # ~~~ if (CMAKE_C_COMPILER_ID MATCHES "Clang") - set_source_files_properties (testtool_specreader.cpp testtool_backendbuilder.cpp testtool_backendparser.cpp PROPERTIES - COMPILE_FLAGS -Wno-delete-non-virtual-dtor) + set_source_files_properties (testtool_specreader.cpp testtool_backendbuilder.cpp testtool_backendparser.cpp + PROPERTIES COMPILE_FLAGS -Wno-delete-non-virtual-dtor) endif (CMAKE_C_COMPILER_ID MATCHES "Clang") foreach (file ${TESTS}) diff --git a/src/plugins/augeas/CMakeLists.txt b/src/plugins/augeas/CMakeLists.txt index eb003a5e741..abda23cb92d 100644 --- a/src/plugins/augeas/CMakeLists.txt +++ b/src/plugins/augeas/CMakeLists.txt @@ -7,7 +7,8 @@ if (DEPENDENCY_PHASE) if (LIBAUGEAS_FOUND) if (LIBXML2_FOUND) try_compile ( - HAS_LIBAUGEAS16 "${CMAKE_BINARY_DIR}" "${PROJECT_SOURCE_DIR}/src/plugins/augeas/testaugeas.c" + HAS_LIBAUGEAS16 "${CMAKE_BINARY_DIR}" + "${PROJECT_SOURCE_DIR}/src/plugins/augeas/testaugeas.c" CMAKE_FLAGS -DINCLUDE_DIRECTORIES:STRING=${LIBAUGEAS_INCLUDE_DIR}\;${LIBXML2_INCLUDE_DIR} -DLINK_LIBRARIES:PATH=${LIBAUGEAS_LIBRARIES}\;${LIBXML2_LIBRARIES}) diff --git a/src/plugins/c/CMakeLists.txt b/src/plugins/c/CMakeLists.txt index 239ff0f1f37..598df3aa86b 100644 --- a/src/plugins/c/CMakeLists.txt +++ b/src/plugins/c/CMakeLists.txt @@ -1,3 +1,5 @@ include (LibAddMacros) -add_plugin (c SOURCES c.h c.c COMPONENT libelektra${SO_VERSION}) +add_plugin ( + c + SOURCES c.h c.c COMPONENT libelektra${SO_VERSION}) diff --git a/src/plugins/counter/CMakeLists.txt b/src/plugins/counter/CMakeLists.txt index e4e2051d310..59ae49311ac 100644 --- a/src/plugins/counter/CMakeLists.txt +++ b/src/plugins/counter/CMakeLists.txt @@ -1,3 +1,5 @@ include (LibAddMacros) -add_plugin (counter SOURCES counter.h counter.c COMPONENT libelektra${SO_VERSION}-extra) +add_plugin ( + counter + SOURCES counter.h counter.c COMPONENT libelektra${SO_VERSION}-extra) diff --git a/src/plugins/cpptemplate/CMakeLists.txt b/src/plugins/cpptemplate/CMakeLists.txt index d9fef225f03..199b90e7c52 100644 --- a/src/plugins/cpptemplate/CMakeLists.txt +++ b/src/plugins/cpptemplate/CMakeLists.txt @@ -1,4 +1,6 @@ include (LibAddMacros) -add_plugin (cpptemplate CPP ADD_TEST CPP_TEST TEST_README SOURCES cpptemplate.hpp cpptemplate.cpp cpptemplate_delegate.hpp - cpptemplate_delegate.cpp COMPONENT libelektra${SO_VERSION}-experimental) +add_plugin ( + cpptemplate CPP ADD_TEST CPP_TEST TEST_README + SOURCES cpptemplate.hpp cpptemplate.cpp cpptemplate_delegate.hpp cpptemplate_delegate.cpp COMPONENT + libelektra${SO_VERSION}-experimental) diff --git a/src/plugins/dbusrecv/CMakeLists.txt b/src/plugins/dbusrecv/CMakeLists.txt index 8bd0c406f16..3a85ba73d76 100644 --- a/src/plugins/dbusrecv/CMakeLists.txt +++ b/src/plugins/dbusrecv/CMakeLists.txt @@ -51,10 +51,7 @@ if (ADDTESTING_PHASE) dbusrecv TEST_LINK_LIBRARIES ${STATIC_LIBRARIES} TEST_LINK_ELEKTRA elektra-io-uv - INCLUDE_SYSTEM_DIRECTORIES - ${libuv_INCLUDE_DIRS} - COMPONENT - libelektra${SO_VERSION}-dbus) + INCLUDE_SYSTEM_DIRECTORIES ${libuv_INCLUDE_DIRS} COMPONENT libelektra${SO_VERSION}-dbus) # add sources manually because add_plugintest does not support generator expressions for additional source files if (BUILD_FULL OR BUILD_STATIC) diff --git a/src/plugins/desktop/CMakeLists.txt b/src/plugins/desktop/CMakeLists.txt index f201cf3660f..bf59b648f99 100644 --- a/src/plugins/desktop/CMakeLists.txt +++ b/src/plugins/desktop/CMakeLists.txt @@ -1,3 +1,5 @@ include (LibAddMacros) -add_plugin (desktop SOURCES desktop.h desktop.c COMPONENT libelektra${SO_VERSION}-extra) +add_plugin ( + desktop + SOURCES desktop.h desktop.c COMPONENT libelektra${SO_VERSION}-extra) diff --git a/src/plugins/dpkg/CMakeLists.txt b/src/plugins/dpkg/CMakeLists.txt index 0b2ff3948ec..eb10da78507 100644 --- a/src/plugins/dpkg/CMakeLists.txt +++ b/src/plugins/dpkg/CMakeLists.txt @@ -1,3 +1,5 @@ include (LibAddMacros) -add_plugin (dpkg SOURCES dpkg.h dpkg.c COMPONENT libelektra${SO_VERSION}-extra) +add_plugin ( + dpkg + SOURCES dpkg.h dpkg.c COMPONENT libelektra${SO_VERSION}-extra) diff --git a/src/plugins/dump/CMakeLists.txt b/src/plugins/dump/CMakeLists.txt index 6a857270f5d..ecd0a3d7857 100644 --- a/src/plugins/dump/CMakeLists.txt +++ b/src/plugins/dump/CMakeLists.txt @@ -1,6 +1,8 @@ include (LibAddPlugin) -add_plugin (dump SOURCES dump.hpp dump.cpp COMPONENT libelektra${SO_VERSION}) +add_plugin ( + dump + SOURCES dump.hpp dump.cpp COMPONENT libelektra${SO_VERSION}) if (ADDTESTING_PHASE) add_plugintest (dump INSTALL_TEST_DATA INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/src/plugins/error/CMakeLists.txt b/src/plugins/error/CMakeLists.txt index 99b1020635f..34c110d77b8 100644 --- a/src/plugins/error/CMakeLists.txt +++ b/src/plugins/error/CMakeLists.txt @@ -1,3 +1,5 @@ include (LibAddMacros) -add_plugin (error SOURCES error.h error.c COMPONENT libelektra${SO_VERSION}-extra) +add_plugin ( + error + SOURCES error.h error.c COMPONENT libelektra${SO_VERSION}-extra) diff --git a/src/plugins/gopts/CMakeLists.txt b/src/plugins/gopts/CMakeLists.txt index 81c95e3d5ab..efe77619d55 100644 --- a/src/plugins/gopts/CMakeLists.txt +++ b/src/plugins/gopts/CMakeLists.txt @@ -7,8 +7,10 @@ elseif (APPLE) set (ELEKTRA_GOPTS_OSX ON) set (gopts_source gopts_osx.h) else () - try_compile (SYSCTL_TEST ${CMAKE_CURRENT_BINARY_DIR} "${CMAKE_SOURCE_DIR}/src/plugins/gopts/sysctl_test.c" - OUTPUT_VARIABLE SYSCTL_TEST_OUTPUT) + try_compile ( + SYSCTL_TEST ${CMAKE_CURRENT_BINARY_DIR} + "${CMAKE_SOURCE_DIR}/src/plugins/gopts/sysctl_test.c" + OUTPUT_VARIABLE SYSCTL_TEST_OUTPUT) if (SYSCTL_TEST) set (ELEKTRA_GOPTS_SYSCTL ON) diff --git a/src/plugins/logchange/CMakeLists.txt b/src/plugins/logchange/CMakeLists.txt index 8d92d20d5a7..cb0fd578de9 100644 --- a/src/plugins/logchange/CMakeLists.txt +++ b/src/plugins/logchange/CMakeLists.txt @@ -1,3 +1,5 @@ include (LibAddMacros) -add_plugin (logchange SOURCES logchange.h logchange.c COMPONENT libelektra${SO_VERSION}-extra) +add_plugin ( + logchange + SOURCES logchange.h logchange.c COMPONENT libelektra${SO_VERSION}-extra) diff --git a/src/plugins/noresolver/CMakeLists.txt b/src/plugins/noresolver/CMakeLists.txt index 61352c0c070..44f0fe2fe46 100644 --- a/src/plugins/noresolver/CMakeLists.txt +++ b/src/plugins/noresolver/CMakeLists.txt @@ -1,3 +1,5 @@ include (LibAddMacros) -add_plugin (noresolver SOURCES noresolver.h noresolver.c COMPONENT libelektra${SO_VERSION}) +add_plugin ( + noresolver + SOURCES noresolver.h noresolver.c COMPONENT libelektra${SO_VERSION}) diff --git a/src/plugins/shell/CMakeLists.txt b/src/plugins/shell/CMakeLists.txt index fdd31e28d75..d6e1b65eb45 100644 --- a/src/plugins/shell/CMakeLists.txt +++ b/src/plugins/shell/CMakeLists.txt @@ -1,3 +1,5 @@ include (LibAddMacros) -add_plugin (shell TEST_README SOURCES shell.h shell.c COMPONENT libelektra${SO_VERSION}) +add_plugin ( + shell TEST_README + SOURCES shell.h shell.c COMPONENT libelektra${SO_VERSION}) diff --git a/src/plugins/sync/CMakeLists.txt b/src/plugins/sync/CMakeLists.txt index 16b971759dd..1e9c6d51bf6 100644 --- a/src/plugins/sync/CMakeLists.txt +++ b/src/plugins/sync/CMakeLists.txt @@ -1,3 +1,5 @@ include (LibAddMacros) -add_plugin (sync SOURCES sync.h sync.c COMPONENT libelektra${SO_VERSION}) +add_plugin ( + sync + SOURCES sync.h sync.c COMPONENT libelektra${SO_VERSION}) diff --git a/src/plugins/syslog/CMakeLists.txt b/src/plugins/syslog/CMakeLists.txt index 0749ec30306..23963359705 100644 --- a/src/plugins/syslog/CMakeLists.txt +++ b/src/plugins/syslog/CMakeLists.txt @@ -1,3 +1,5 @@ include (LibAddMacros) -add_plugin (syslog SOURCES log.h syslog.c COMPONENT libelektra${SO_VERSION}-extra) +add_plugin ( + syslog + SOURCES log.h syslog.c COMPONENT libelektra${SO_VERSION}-extra) diff --git a/src/plugins/timeofday/CMakeLists.txt b/src/plugins/timeofday/CMakeLists.txt index be89691ce0b..fad6a818eb6 100644 --- a/src/plugins/timeofday/CMakeLists.txt +++ b/src/plugins/timeofday/CMakeLists.txt @@ -1,3 +1,5 @@ include (LibAddMacros) -add_plugin (timeofday SOURCES timeofday.h timeofday.c COMPONENT libelektra${SO_VERSION}-extra) +add_plugin ( + timeofday + SOURCES timeofday.h timeofday.c COMPONENT libelektra${SO_VERSION}-extra) diff --git a/src/plugins/tracer/CMakeLists.txt b/src/plugins/tracer/CMakeLists.txt index 0790fb4731a..dbec5934fde 100644 --- a/src/plugins/tracer/CMakeLists.txt +++ b/src/plugins/tracer/CMakeLists.txt @@ -1,3 +1,5 @@ include (LibAddMacros) -add_plugin (tracer SOURCES tracer.h tracer.c COMPONENT libelektra${SO_VERSION}-extra) +add_plugin ( + tracer + SOURCES tracer.h tracer.c COMPONENT libelektra${SO_VERSION}-extra) diff --git a/src/plugins/wresolver/CMakeLists.txt b/src/plugins/wresolver/CMakeLists.txt index a7948f2c715..a2831c49fe7 100644 --- a/src/plugins/wresolver/CMakeLists.txt +++ b/src/plugins/wresolver/CMakeLists.txt @@ -1,3 +1,5 @@ include (LibAddMacros) -add_plugin (wresolver SOURCES wresolver.h wresolver.c COMPONENT libelektra${SO_VERSION}) +add_plugin ( + wresolver + SOURCES wresolver.h wresolver.c COMPONENT libelektra${SO_VERSION}) diff --git a/src/plugins/yamlcpp/CMakeLists.txt b/src/plugins/yamlcpp/CMakeLists.txt index 0632b6de156..87fc90411f9 100644 --- a/src/plugins/yamlcpp/CMakeLists.txt +++ b/src/plugins/yamlcpp/CMakeLists.txt @@ -35,9 +35,7 @@ set_source_files_properties ( write.hpp write.cpp log.hpp - PROPERTIES - COMPILE_FLAGS - "-Wconversion") + PROPERTIES COMPILE_FLAGS "-Wconversion") # —————————————————————————————————————————————————————————— add_plugin ( diff --git a/src/tools/elektrad/CMakeLists.txt b/src/tools/elektrad/CMakeLists.txt index c83cb4e7d2c..e5b0c1e93cc 100644 --- a/src/tools/elektrad/CMakeLists.txt +++ b/src/tools/elektrad/CMakeLists.txt @@ -32,8 +32,7 @@ else () add_custom_command ( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/elektrad/elektrad" - COMMAND - ${CMAKE_COMMAND} ARGS -E env GO111MODULE=on PKG_CONFIG_PATH=${CMAKE_CURRENT_BINARY_DIR} ${GO_EXECUTABLE} build -o + COMMAND ${CMAKE_COMMAND} ARGS -E env GO111MODULE=on PKG_CONFIG_PATH=${CMAKE_CURRENT_BINARY_DIR} ${GO_EXECUTABLE} build -o "${CMAKE_CURRENT_BINARY_DIR}/elektrad/elektrad" COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_CURRENT_BINARY_DIR}/elektrad/elektrad" "${CMAKE_BINARY_DIR}/bin/elektrad" diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index afd5bef6b05..656283266a1 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -23,10 +23,7 @@ if (ENABLE_TESTING) download_project ( PROJ googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG release-1.10.0 - QUIET - UPDATE_DISCONNECTED - 1) + GIT_TAG release-1.10.0 QUIET UPDATE_DISCONNECTED 1) endif (DEFINED GOOGLETEST_ROOT) # Prevent GoogleTest from overriding our compiler/linker options when building with Visual Studio