[llvm] r305222 - Addressed Takumi's comment about redundancy.

[NAKAMURA Takumi via llvm-commits]

Thanks!

On Tue, Jun 13, 2017 at 4:18 AM Galina Kistanova via llvm-commits <
llvm-commits at lists.llvm.org> wrote:

> Author: gkistanova
> Date: Mon Jun 12 14:17:55 2017
> New Revision: 305222
>
> URL: http://llvm.org/viewvc/llvm-project?rev=305222&view=rev
> Log:
> Addressed Takumi's comment about redundancy.
>
> Modified:
>     llvm/trunk/cmake/modules/TableGen.cmake
>
> Modified: llvm/trunk/cmake/modules/TableGen.cmake
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/TableGen.cmake?rev=305222&r1=305221&r2=305222&view=diff
>
> ==============================================================================
> --- llvm/trunk/cmake/modules/TableGen.cmake (original)
> +++ llvm/trunk/cmake/modules/TableGen.cmake Mon Jun 12 14:17:55 2017
> @@ -35,38 +35,24 @@ function(tablegen project ofn)
>    # a tablegen change, as cmake does not propagate file-level dependencies
>    # of custom targets. See the following ticket for more information:
>    # https://cmake.org/Bug/view.php?id=15858
> -  # We could always have just one dependency on both the target and
> -  # the file, but these 2 cases would produce cleaner cmake files.
> -  if ("${${project}_TABLEGEN_TARGET}" STREQUAL
> "${${project}_TABLEGEN_EXE}")
> -    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${ofn}.tmp
> -      # Generate tablegen output in a temporary file.
> -      COMMAND ${${project}_TABLEGEN_EXE} ${ARGN} -I
> ${CMAKE_CURRENT_SOURCE_DIR}
> -      ${LLVM_TABLEGEN_FLAGS}
> -      ${LLVM_TARGET_DEFINITIONS_ABSOLUTE}
> -      -o ${CMAKE_CURRENT_BINARY_DIR}/${ofn}.tmp
> -      # The file in LLVM_TARGET_DEFINITIONS may be not in the current
> -      # directory and local_tds may not contain it, so we must
> -      # explicitly list it here:
> -      DEPENDS ${${project}_TABLEGEN_TARGET} ${local_tds} ${global_tds}
> -      ${LLVM_TARGET_DEFINITIONS_ABSOLUTE}
> -      COMMENT "Building ${ofn}..."
> -      )
> -  else()
> -    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${ofn}.tmp
> -      # Generate tablegen output in a temporary file.
> -      COMMAND ${${project}_TABLEGEN_EXE} ${ARGN} -I
> ${CMAKE_CURRENT_SOURCE_DIR}
> -      ${LLVM_TABLEGEN_FLAGS}
> -      ${LLVM_TARGET_DEFINITIONS_ABSOLUTE}
> -      -o ${CMAKE_CURRENT_BINARY_DIR}/${ofn}.tmp
> -      # The file in LLVM_TARGET_DEFINITIONS may be not in the current
> -      # directory and local_tds may not contain it, so we must
> -      # explicitly list it here:
> -      DEPENDS ${${project}_TABLEGEN_TARGET} ${${project}_TABLEGEN_EXE}
> -        ${local_tds} ${global_tds}
> -      ${LLVM_TARGET_DEFINITIONS_ABSOLUTE}
> -      COMMENT "Building ${ofn}..."
> -      )
> -  endif()
> +  # The dependency on both, the target and the file, produces the same
> +  # dependency twice in the result file when
> +  # ("${${project}_TABLEGEN_TARGET}" STREQUAL
> "${${project}_TABLEGEN_EXE}")
> +  # but lets us having smaller and cleaner code here.
> +  add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${ofn}.tmp
> +    # Generate tablegen output in a temporary file.
> +    COMMAND ${${project}_TABLEGEN_EXE} ${ARGN} -I
> ${CMAKE_CURRENT_SOURCE_DIR}
> +    ${LLVM_TABLEGEN_FLAGS}
> +    ${LLVM_TARGET_DEFINITIONS_ABSOLUTE}
> +    -o ${CMAKE_CURRENT_BINARY_DIR}/${ofn}.tmp
> +    # The file in LLVM_TARGET_DEFINITIONS may be not in the current
> +    # directory and local_tds may not contain it, so we must
> +    # explicitly list it here:
> +    DEPENDS ${${project}_TABLEGEN_TARGET} ${${project}_TABLEGEN_EXE}
> +      ${local_tds} ${global_tds}
> +    ${LLVM_TARGET_DEFINITIONS_ABSOLUTE}
> +    COMMENT "Building ${ofn}..."
> +    )
>    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${ofn}
>      # Only update the real output file if there are any differences.
>      # This prevents recompilation of all the files depending on it if
> there
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170613/fde44a5a/attachment-0001.html>