CMake: [nfc] wrap to 80 character column width

Upcoming changes to introduce `cmake-format` checks default to this, which suits
Graphviz well as it matches the (claimed) `clang-format` C/C++ style.

diff --git a/cmake/FindANN.cmake b/cmake/FindANN.cmake
index 981ba469711623b140efaf2de1cdfc727157dcde..ceb85f815bdc1f095d4b148c8c67077dc8d77995 100644 (file)
--- a/cmake/FindANN.cmake
+++ b/cmake/FindANN.cmake
@@ -5,7 +5,8 @@ find_program(ANN_RUNTIME_LIBRARY ANN.dll)
 include(FindPackageHandleStandardArgs)
 if(WIN32)
   find_package_handle_standard_args(ANN DEFAULT_MSG
-                                    ANN_LIBRARY ANN_INCLUDE_DIR ANN_RUNTIME_LIBRARY)
+                                    ANN_LIBRARY ANN_INCLUDE_DIR
+                                    ANN_RUNTIME_LIBRARY)
 else()
   find_package_handle_standard_args(ANN DEFAULT_MSG
                                     ANN_LIBRARY ANN_INCLUDE_DIR)

diff --git a/cmake/FindCAIRO.cmake b/cmake/FindCAIRO.cmake
index 66006c6e8bbed467b69e06a2b41e69f5fa22905d..5d706b61447dd1b6d8d8212fdaee230dfa1687ff 100644 (file)
--- a/cmake/FindCAIRO.cmake
+++ b/cmake/FindCAIRO.cmake
@@ -7,7 +7,8 @@ if(WIN32)
 
   find_program(CAIRO_RUNTIME_LIBRARY NAMES cairo.dll libcairo-2.dll)
   find_program(EXPAT_RUNTIME_LIBRARY NAMES expat.dll libexpat-1.dll)
-  find_program(FONTCONFIG_RUNTIME_LIBRARY NAMES fontconfig.dll libfontconfig-1.dll)
+  find_program(FONTCONFIG_RUNTIME_LIBRARY
+               NAMES fontconfig.dll libfontconfig-1.dll)
   find_program(PIXMAN_RUNTIME_LIBRARY NAMES pixman-1.dll libpixman-1-0.dll)
 
   find_package_handle_standard_args(CAIRO DEFAULT_MSG

diff --git a/cmake/FindGD.cmake b/cmake/FindGD.cmake
index e40dc205162aa2b291df87978e403fd65240e326..9a3ed17214ab93b861b672d01ed77d4e49f35640 100644 (file)
--- a/cmake/FindGD.cmake
+++ b/cmake/FindGD.cmake
@@ -5,7 +5,8 @@ find_program(GD_RUNTIME_LIBRARY libgd.dll)
 include(FindPackageHandleStandardArgs)
 if(WIN32)
   find_package_handle_standard_args(GD DEFAULT_MSG
-                                    GD_LIBRARY GD_INCLUDE_DIR GD_RUNTIME_LIBRARY)
+                                    GD_LIBRARY GD_INCLUDE_DIR
+                                    GD_RUNTIME_LIBRARY)
 else()
   find_package_handle_standard_args(GD DEFAULT_MSG
                                     GD_LIBRARY GD_INCLUDE_DIR)

diff --git a/cmake/FindNSIS.cmake b/cmake/FindNSIS.cmake
index d5600d221b94c20ee1317ddd26f857d05b692fda..3ff1ba8b956ac61daa844d1f73a94a36ac70f483 100644 (file)
--- a/cmake/FindNSIS.cmake
+++ b/cmake/FindNSIS.cmake
@@ -1,4 +1,5 @@
-# CMake does not allow for braces in $ENV{}, so a temporary variable must be used.
+# CMake does not allow for braces in $ENV{}, so a temporary variable must be
+# used.
 set(PROGRAMFILES_X86 "ProgramFiles(x86)")
 
 find_program(NSIS_MAKE

diff --git a/cmake/FindPANGOCAIRO.cmake b/cmake/FindPANGOCAIRO.cmake
index ab70da9100deffd91c652193b862c844095b5e9a..e045e8ff61c485834b751a480f9fd4dd9a411758 100644 (file)
--- a/cmake/FindPANGOCAIRO.cmake
+++ b/cmake/FindPANGOCAIRO.cmake
@@ -3,7 +3,8 @@ include(FindPackageHandleStandardArgs)
 if(WIN32)
   find_path(PANGOCAIRO_INCLUDE_DIR pango/pangocairo.h PATH_SUFFIXES pango-1.0)
   find_path(GLIB_INCLUDE_DIR glib.h PATH_SUFFIXES glib-2.0)
-  find_path(GLIBCONFIG_INCLUDE_DIR glibconfig.h PATH_SUFFIXES glib-2.0/include lib/glib-2.0/include)
+  find_path(GLIBCONFIG_INCLUDE_DIR glibconfig.h
+            PATH_SUFFIXES glib-2.0/include lib/glib-2.0/include)
   find_path(HARFBUZZ_INCLUDE_DIR hb.h PATH_SUFFIXES harfbuzz)
 
   find_library(GLIB_LIBRARY NAMES glib-2.0)
@@ -16,9 +17,12 @@ if(WIN32)
   find_program(GOBJECT_RUNTIME_LIBRARY NAMES gobject-2.dll libgobject-2.0-0.dll)
   find_program(HARFBUZZ_RUNTIME_LIBRARY NAMES libharfbuzz-0.dll)
   find_program(PANGO_RUNTIME_LIBRARY NAMES pango-1.dll libpango-1.0-0.dll)
-  find_program(PANGOCAIRO_RUNTIME_LIBRARY NAMES pangocairo-1.dll libpangocairo-1.0-0.dll)
-  find_program(PANGOFT_RUNTIME_LIBRARY NAMES pangoft2-1.dll libpangoft2-1.0-0.dll)
-  find_program(PANGOWIN_RUNTIME_LIBRARY NAMES pangowin32-1.dll libpangowin32-1.0-0.dll)
+  find_program(PANGOCAIRO_RUNTIME_LIBRARY
+               NAMES pangocairo-1.dll libpangocairo-1.0-0.dll)
+  find_program(PANGOFT_RUNTIME_LIBRARY
+               NAMES pangoft2-1.dll libpangoft2-1.0-0.dll)
+  find_program(PANGOWIN_RUNTIME_LIBRARY
+               NAMES pangowin32-1.dll libpangowin32-1.0-0.dll)
 
   find_package_handle_standard_args(PANGOCAIRO DEFAULT_MSG
     GLIB_INCLUDE_DIR

diff --git a/cmake/cmake_uninstall.cmake.in b/cmake/cmake_uninstall.cmake.in
index b7563d0a2178cd0e1a6f928c67df30e7dbe7c14f..f24ad5bb2a10880ff0cf7b7e8ff5da8a1c8cfac5 100644 (file)
--- a/cmake/cmake_uninstall.cmake.in
+++ b/cmake/cmake_uninstall.cmake.in
@@ -1,5 +1,6 @@
 if(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
-  message(FATAL_ERROR "Cannot find install manifest: @CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+  message(FATAL_ERROR "Cannot find install manifest: \
+@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
 endif(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
 
 file(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)

diff --git a/cmake/configure_plugins.cmake b/cmake/configure_plugins.cmake
index e72984f508ace64b81cd351813b583a010fbcd98..d4d41a17ba69031b4670e7afade9ccebc5902fb2 100644 (file)
--- a/cmake/configure_plugins.cmake
+++ b/cmake/configure_plugins.cmake
@@ -9,7 +9,8 @@
 #
 # For the ZIP CPack generator:
 #   $ENV{DESTDIR} is empty
-#   ${CMAKE_INSTALL_PREFIX} is the absolute path to the staging install directory
+#   ${CMAKE_INSTALL_PREFIX} is the absolute path to the staging install
+#     directory
 #
 # For the NSIS and DEB CPack generators:
 #   $ENV{DESTDIR} is the absolute path to the staging install directory
@@ -19,6 +20,7 @@
 # ${CMAKE_INSTALL_PREFIX} to get the location of the 'bin' and 'lib'
 # directories in the staging install area.
 #
+# cmake-lint: disable=C0301
 # More info:
 #   https://cmake.org/cmake/help/latest/variable/CMAKE_INSTALL_PREFIX.html#variable:CMAKE_INSTALL_PREFIX
 #   https://cmake.org/cmake/help/latest/envvar/DESTDIR.html

diff --git a/cmake/package_info.cmake b/cmake/package_info.cmake
index 1f36e65f91f4cad1c7f9fc21872ff07d60ba28cf..29e2b9a7305675f91a816ba406963b9f5447f52d 100644 (file)
--- a/cmake/package_info.cmake
+++ b/cmake/package_info.cmake
@@ -29,19 +29,20 @@ endif()
 
 find_package(NSIS)
 if(NSIS_FOUND)
-  set(CPACK_NSIS_MUI_ICON                 "${TOP_SOURCE_DIR}/windows/build/Graphviz.ico"  )
-  set(CPACK_NSIS_MUI_UNIICON              "${TOP_SOURCE_DIR}/windows/build/Graphviz.ico"  )
-  set(CPACK_NSIS_INSTALLED_ICON_NAME      "Uninstall.exe"                                 )
-  set(CPACK_NSIS_HELP_LINK                "http://www.graphviz.org"                       )
-  set(CPACK_NSIS_URL_INFO_ABOUT           "http://www.graphviz.org"                       )
-  set(CPACK_NSIS_MODIFY_PATH              ON                                              )
+  set(CPACK_NSIS_MUI_ICON "${TOP_SOURCE_DIR}/windows/build/Graphviz.ico")
+  set(CPACK_NSIS_MUI_UNIICON "${TOP_SOURCE_DIR}/windows/build/Graphviz.ico")
+  set(CPACK_NSIS_INSTALLED_ICON_NAME "Uninstall.exe")
+  set(CPACK_NSIS_HELP_LINK "http://www.graphviz.org")
+  set(CPACK_NSIS_URL_INFO_ABOUT "http://www.graphviz.org")
+  set(CPACK_NSIS_MODIFY_PATH ON)
   if(CMAKE_CL_64)
     set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES64")
   else()
     set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES")
   endif()
   set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "
-    Delete \\\"${CPACK_NSIS_INSTALL_ROOT}\\\\${CPACK_PACKAGE_INSTALL_DIRECTORY}\\\\${BINARY_INSTALL_DIR}\\\\config6\\\"
+    Delete \\\"${CPACK_NSIS_INSTALL_ROOT}\\\\${CPACK_PACKAGE_INSTALL_DIRECTORY}\
+\\\\${BINARY_INSTALL_DIR}\\\\config6\\\"
   ")
   LIST(APPEND CPACK_GENERATOR NSIS)
 endif()

diff --git a/cmd/dot/CMakeLists.txt b/cmd/dot/CMakeLists.txt
index 8d9b4528d5088bc0bb8e5ed737fcd31481fd4fac..d3e88998ab6d6cc67f88a377d239ef035e08c6aa 100644 (file)
--- a/cmd/dot/CMakeLists.txt
+++ b/cmd/dot/CMakeLists.txt
@@ -38,7 +38,8 @@ list(APPEND dot_aliases circo fdp neato osage patchwork sfdp twopi)
 if(WIN32 OR CYGWIN)
   # Copy dot executable to each alias name then install copies to bindir
   foreach(cmd_alias IN LISTS dot_aliases)
-    set(dotcopy "${CMAKE_CURRENT_BINARY_DIR}/${cmd_alias}${CMAKE_EXECUTABLE_SUFFIX}")
+    set(dotcopy
+        "${CMAKE_CURRENT_BINARY_DIR}/${cmd_alias}${CMAKE_EXECUTABLE_SUFFIX}")
     add_custom_command(
       TARGET dot
       POST_BUILD
@@ -51,18 +52,19 @@ if(WIN32 OR CYGWIN)
     )
   endforeach()
 else()
-  # For not-WIN32, install symlinks from dot_aliases -> dot_executable in bindir.
-  # Note: This may be brittle. This builds a symlink from ./cmd_alias -> ./dot
-  # in ${CMAKE_CURRENT_BINARY_DIR}, then installs that symlink
-  # into ${BINARY_INSTALL_DIR}. This presumes ${CMAKE_CURRENT_BINARY_DIR}/dot
-  # is installed to ${BINARY_INSTALL_DIR}/dot. There is a (small?) risk of
-  # dangling symlinks
+  # For not-WIN32, install symlinks from dot_aliases -> dot_executable in
+  # bindir. Note: This may be brittle. This builds a symlink from
+  # ./cmd_alias -> ./dot in ${CMAKE_CURRENT_BINARY_DIR}, then installs that
+  # symlink into ${BINARY_INSTALL_DIR}. This presumes
+  # ${CMAKE_CURRENT_BINARY_DIR}/dot is installed to ${BINARY_INSTALL_DIR}/dot.
+  # There is a (small?) risk of dangling symlinks
   foreach(cmd_alias IN LISTS dot_aliases)
     set(dotlink "${CMAKE_CURRENT_BINARY_DIR}/${cmd_alias}")
     add_custom_command(
       TARGET dot
       POST_BUILD
-      COMMAND ${CMAKE_COMMAND} -E create_symlink $<TARGET_FILE_NAME:dot> ${cmd_alias}
+      COMMAND ${CMAKE_COMMAND} -E create_symlink $<TARGET_FILE_NAME:dot>
+        ${cmd_alias}
       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
       COMMENT "Linking $<TARGET_FILE_NAME:dot> as ${cmd_alias}"
     )

diff --git a/cmd/tools/CMakeLists.txt b/cmd/tools/CMakeLists.txt
index 36cbce708760e11a0e523d87746dadffacc6b512..619b2613c4210b12dc0541b7ac462e8a3f5233c1 100644 (file)
--- a/cmd/tools/CMakeLists.txt
+++ b/cmd/tools/CMakeLists.txt
@@ -99,8 +99,10 @@ target_link_libraries(dijkstra
 tool_defaults(dijkstra)
 
 # =================================== gml2gv ===================================
-BISON_TARGET(Gmlparse ${CMAKE_CURRENT_SOURCE_DIR}/gmlparse.y ${CMAKE_CURRENT_BINARY_DIR}/gmlparse.c)
-FLEX_TARGET(Gmlscan ${CMAKE_CURRENT_SOURCE_DIR}/gmlscan.l  ${CMAKE_CURRENT_BINARY_DIR}/gmlscan.c)
+BISON_TARGET(Gmlparse ${CMAKE_CURRENT_SOURCE_DIR}/gmlparse.y
+                      ${CMAKE_CURRENT_BINARY_DIR}/gmlparse.c)
+FLEX_TARGET(Gmlscan ${CMAKE_CURRENT_SOURCE_DIR}/gmlscan.l
+                    ${CMAKE_CURRENT_BINARY_DIR}/gmlscan.c)
 ADD_FLEX_BISON_DEPENDENCY(Gmlscan Gmlparse)
 
 add_executable(gml2gv

diff --git a/lib/cgraph/CMakeLists.txt b/lib/cgraph/CMakeLists.txt
index 1ec804fe062b2b020b8371faa999cefb27cca3e5..9e0789214c191123e43688c5644b77186a7a9751 100644 (file)
--- a/lib/cgraph/CMakeLists.txt
+++ b/lib/cgraph/CMakeLists.txt
@@ -1,5 +1,7 @@
-BISON_TARGET(Grammar ${CMAKE_CURRENT_SOURCE_DIR}/grammar.y ${CMAKE_CURRENT_BINARY_DIR}/grammar.c)
-FLEX_TARGET(Scan ${CMAKE_CURRENT_SOURCE_DIR}/scan.l  ${CMAKE_CURRENT_BINARY_DIR}/scan.c)
+BISON_TARGET(Grammar ${CMAKE_CURRENT_SOURCE_DIR}/grammar.y
+                     ${CMAKE_CURRENT_BINARY_DIR}/grammar.c)
+FLEX_TARGET(Scan ${CMAKE_CURRENT_SOURCE_DIR}/scan.l
+                 ${CMAKE_CURRENT_BINARY_DIR}/scan.c)
 ADD_FLEX_BISON_DEPENDENCY(Scan Grammar)
 
 add_definitions(-DEXPORT_CGRAPH -DEXPORT_AGXBUF -DEXPORT_CGHDR)

diff --git a/lib/common/CMakeLists.txt b/lib/common/CMakeLists.txt
index 18faeb2563d78a54e07a745ab7b37b4e436df2dc..5231a78d48e9578ed515a7331e58a3d699e27c6b 100644 (file)
--- a/lib/common/CMakeLists.txt
+++ b/lib/common/CMakeLists.txt
@@ -1,4 +1,5 @@
-BISON_TARGET(HTMLparse ${CMAKE_CURRENT_SOURCE_DIR}/htmlparse.y ${CMAKE_CURRENT_BINARY_DIR}/htmlparse.c)
+BISON_TARGET(HTMLparse ${CMAKE_CURRENT_SOURCE_DIR}/htmlparse.y
+                       ${CMAKE_CURRENT_BINARY_DIR}/htmlparse.c)
 
 add_definitions(-DGVC_EXPORTS)
 
@@ -9,15 +10,19 @@ endif()
 # Generate colortbl.h from sources
 add_custom_command(
   OUTPUT svgcolor_lib
-  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/svgcolor_names ${TOP_SOURCE_DIR}/awk/svgcolor.awk
+  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/svgcolor_names
+          ${TOP_SOURCE_DIR}/awk/svgcolor.awk
   COMMAND ${AWK_EXECUTABLE} ${AWK_OPTIONS} -f ${TOP_SOURCE_DIR}/awk/svgcolor.awk
-          ${CMAKE_CURRENT_SOURCE_DIR}/svgcolor_names > ${CMAKE_CURRENT_BINARY_DIR}/svgcolor_lib
+          ${CMAKE_CURRENT_SOURCE_DIR}/svgcolor_names
+          >${CMAKE_CURRENT_BINARY_DIR}/svgcolor_lib
 )
 add_custom_command(
   OUTPUT brewer_lib
-  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/brewer_colors ${TOP_SOURCE_DIR}/awk/brewer.awk
+  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/brewer_colors
+          ${TOP_SOURCE_DIR}/awk/brewer.awk
   COMMAND ${AWK_EXECUTABLE} -f ${TOP_SOURCE_DIR}/awk/brewer.awk
-          ${CMAKE_CURRENT_SOURCE_DIR}/brewer_colors > ${CMAKE_CURRENT_BINARY_DIR}/brewer_lib
+          ${CMAKE_CURRENT_SOURCE_DIR}/brewer_colors
+          >${CMAKE_CURRENT_BINARY_DIR}/brewer_lib
 )
 configure_file(
   "${TOP_SOURCE_DIR}/cmake/generate_color_lib.cmake.in"
@@ -26,15 +31,20 @@ configure_file(
 )
 add_custom_command(
   OUTPUT color_lib
-  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/svgcolor_lib ${CMAKE_CURRENT_BINARY_DIR}/brewer_lib ${CMAKE_CURRENT_SOURCE_DIR}/color_names
-  COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/generate_color_lib.cmake
+  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/svgcolor_lib
+          ${CMAKE_CURRENT_BINARY_DIR}/brewer_lib
+          ${CMAKE_CURRENT_SOURCE_DIR}/color_names
+  COMMAND ${CMAKE_COMMAND} -P
+          ${CMAKE_CURRENT_BINARY_DIR}/generate_color_lib.cmake
 )
 add_custom_command(
   OUTPUT common/colortbl.h
   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/color_lib
-  COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/common"
+  COMMAND ${CMAKE_COMMAND} -E make_directory
+          "${CMAKE_CURRENT_BINARY_DIR}/common"
   COMMAND ${AWK_EXECUTABLE} -f ${TOP_SOURCE_DIR}/awk/colortbl.awk
-          ${CMAKE_CURRENT_BINARY_DIR}/color_lib > ${CMAKE_CURRENT_BINARY_DIR}/common/colortbl.h
+          ${CMAKE_CURRENT_BINARY_DIR}/color_lib
+          >${CMAKE_CURRENT_BINARY_DIR}/common/colortbl.h
 )
 
 add_library(common_obj OBJECT
@@ -110,7 +120,8 @@ target_include_directories(common_obj PRIVATE
 )
 
 if(WIN32)
-  target_include_directories(common_obj PRIVATE ${WINDOWS_DEPENDENCY_DIR}/include)
+  target_include_directories(common_obj
+                             PRIVATE ${WINDOWS_DEPENDENCY_DIR}/include)
 endif()
 
 # From https://gitlab.com/graphviz/graphviz/-/issues/1613 @mdwies 20093010

diff --git a/lib/gvpr/CMakeLists.txt b/lib/gvpr/CMakeLists.txt
index c474ad97730707880c0fa7f494c18faa3144e6bb..b60e0a3bdc899c51d871be2deed69977f9d5fabd 100644 (file)
--- a/lib/gvpr/CMakeLists.txt
+++ b/lib/gvpr/CMakeLists.txt
@@ -25,7 +25,8 @@ target_include_directories(gvpr PRIVATE
   ${GRAPHVIZ_LIB_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}/.. # needed to find generated expr/exparse.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../common # needed to find generated common/colortbl.h
+  ${CMAKE_CURRENT_BINARY_DIR}/../common
+    # needed to find generated common/colortbl.h
   ${GRAPHVIZ_LIB_DIR}/ast
   ${GRAPHVIZ_LIB_DIR}/cdt
   ${GRAPHVIZ_LIB_DIR}/cgraph

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 5ee6c676e0938b7bf6e634288b2e810ed6c2eadc..ad7b739f1542219c9658f68288f0138ff208b96c 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -44,7 +44,8 @@ macro(create_test testname)
   add_executable(test_${testname} test_${testname}.cpp)
   set_target_properties(test_${testname} PROPERTIES CXX_STANDARD 20)
   set_target_properties(test_${testname} PROPERTIES CXX_STANDARD_REQUIRED ON)
-  add_test(NAME test_${testname} COMMAND test_${testname} --reporter junit --out test_${testname}.xml)
+  add_test(NAME test_${testname}
+           COMMAND test_${testname} --reporter junit --out test_${testname}.xml)
   target_include_directories(test_${testname} PRIVATE
     ${GRAPHVIZ_LIB_DIR}
     ${GRAPHVIZ_LIB_DIR}/cdt