]> granicus.if.org Git - graphviz/commitdiff
CMake: remove generator expressions in comments
authorMatthew Fernandez <matthew.fernandez@gmail.com>
Sat, 26 Mar 2022 18:16:26 +0000 (11:16 -0700)
committerMatthew Fernandez <matthew.fernandez@gmail.com>
Tue, 29 Mar 2022 05:53:59 +0000 (22:53 -0700)
Generator expressions¹ within strings are not expanded. So these lines were
leading to confusing build output indicating the literal text of the generator
expression was being symlinked:

  [ 79%] Linking C executable dot
  Linking $<TARGET_FILE_NAME:dot> as circo
  Linking $<TARGET_FILE_NAME:dot> as fdp
  Linking $<TARGET_FILE_NAME:dot> as neato
  Linking $<TARGET_FILE_NAME:dot> as osage
  Linking $<TARGET_FILE_NAME:dot> as patchwork
  Linking $<TARGET_FILE_NAME:dot> as sfdp
  Linking $<TARGET_FILE_NAME:dot> as twopi
  [ 79%] Built target dot

¹ https://cmake.org/cmake/help/latest/manual/cmake-generator-expressions.7.html

cmd/dot/CMakeLists.txt
cmd/tools/CMakeLists.txt

index 88f8e0910635d232053bfdbf917861f7b80b0f0d..e354b6472b85cf9f0ffb5bfc74ee8da352b11fed 100644 (file)
@@ -44,7 +44,7 @@ if(WIN32 OR CYGWIN)
       TARGET dot
       POST_BUILD
       COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:dot> ${DOTCOPY}
-      COMMENT "Copying $<TARGET_FILE:dot> to ${DOTCOPY}"
+      COMMENT "Copying dot to ${DOTCOPY}"
     )
     install(
       PROGRAMS ${DOTCOPY}
@@ -66,7 +66,7 @@ else()
       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}"
+      COMMENT "Linking dot as ${cmd_alias}"
     )
     install(
       FILES ${DOTLINK}
index 7ab3d765932f220d2c94da6d390247385462eb7f..6bd41a839f293cb71c31b6a84b526f9343d3b9a4 100644 (file)
@@ -313,7 +313,7 @@ if(EXPAT_FOUND)
       TARGET gxl2gv
       POST_BUILD
       COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:gxl2gv> ${DOT2GXL}
-      COMMENT "Copying $<TARGET_FILE:gxl2gv> to ${DOT2GXL}")
+      COMMENT "Copying gxl2gv to ${DOT2GXL}")
     install(
       PROGRAMS ${DOT2GXL}
       DESTINATION ${BINARY_INSTALL_DIR})
@@ -323,7 +323,7 @@ if(EXPAT_FOUND)
       POST_BUILD
       COMMAND ${CMAKE_COMMAND} -E create_symlink $<TARGET_FILE_NAME:gxl2gv>
         ${DOT2GXL}
-      COMMENT "Linking $<TARGET_FILE_NAME:gxl2gv> as ${DOT2GXL}")
+      COMMENT "Linking gxl2gv as ${DOT2GXL}")
     install(
       FILES ${DOT2GXL}
       DESTINATION ${BINARY_INSTALL_DIR})