From b390dd07ed6be4c77285dc85af5c05df661f078c Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Mon, 23 Oct 2023 15:56:35 -0400
Subject: [PATCH] vtkModule: cleanup whitespace in SPDX generation
Also quote the output file path.
---
CMake/vtkModule.cmake | 34 +++++++++++++++++++---------------
1 file changed, 19 insertions(+), 15 deletions(-)
diff --git a/CMake/vtkModule.cmake b/CMake/vtkModule.cmake
index 5b08f3983ff..f5f172a67e1 100644
--- a/CMake/vtkModule.cmake
+++ b/CMake/vtkModule.cmake
@@ -3680,7 +3680,7 @@ function (vtk_module_add_module name)
if (_vtk_add_module_FORCE_SHARED AND _vtk_add_module_FORCE_STATIC)
message(FATAL_ERROR
"The ${_vtk_build_module} module cannot be both shared and static.")
- endif()
+ endif ()
foreach (_vtk_add_module_class IN LISTS _vtk_add_module_CLASSES)
list(APPEND _vtk_add_module_SOURCES
@@ -3766,7 +3766,7 @@ function (vtk_module_add_module name)
get_cmake_property(_vtk_add_module_target_has_shared TARGET_SUPPORTS_SHARED_LIBS)
if (_vtk_add_module_target_has_shared)
set(_vtk_add_module_type SHARED)
- else()
+ else ()
# XXX(cmake): Until the emscripten platform supports shared libraries,
# do not allow FORCE_SHARED. See [1] and [2] for more information.
# [1]: https://github.com/emscripten-core/emscripten/pull/16281
@@ -3775,8 +3775,8 @@ function (vtk_module_add_module name)
# If some *other* platform does not support shared libraries, issue a warning:
if (NOT EMSCRIPTEN)
message(WARNING "Shared library requested by ${name} not allowed on this platform.")
- endif()
- endif()
+ endif ()
+ endif ()
endif ()
set(_vtk_add_module_build_with_kit)
@@ -5836,7 +5836,6 @@ endfunction ()
#]==]
function (_vtk_module_generate_spdx)
-
cmake_parse_arguments(PARSE_ARGV 0 _vtk_module_generate_spdx
""
"MODULE_NAME;TARGET;OUTPUT;SKIP_REGEX"
@@ -5881,22 +5880,26 @@ function (_vtk_module_generate_spdx)
set(_vtk_module_generate_spdx_output_file "${CMAKE_CURRENT_BINARY_DIR}/${_vtk_module_generate_spdx_OUTPUT}")
string(TIMESTAMP _vtk_module_generate_spdx_timestamp UTC)
- get_property(_vtk_module_generate_spdx_SPDX_LICENSE_IDENTIFIER GLOBAL PROPERTY "_vtk_module_${_vtk_build_module}_spdx_license_identifier")
+ get_property(_vtk_module_generate_spdx_SPDX_LICENSE_IDENTIFIER GLOBAL
+ PROPERTY "_vtk_module_${_vtk_build_module}_spdx_license_identifier")
if (NOT _vtk_module_generate_spdx_SPDX_LICENSE_IDENTIFIER)
message(AUTHOR_WARNING
"The ${_vtk_module_generate_spdx_MODULE_NAME} module should have a non-empty `SPDX_LICENSE_IDENTIFIER`. Defaulting to NOASSERTION.")
set(_vtk_module_generate_spdx_SPDX_LICENSE_IDENTIFIER "NOASSERTION")
endif ()
- get_property(_vtk_module_generate_spdx_SPDX_COPYRIGHT_TEXT GLOBAL PROPERTY "_vtk_module_${_vtk_build_module}_spdx_copyright_text")
+ get_property(_vtk_module_generate_spdx_SPDX_COPYRIGHT_TEXT GLOBAL
+ PROPERTY "_vtk_module_${_vtk_build_module}_spdx_copyright_text")
if (NOT _vtk_module_generate_spdx_SPDX_COPYRIGHT_TEXT)
message(AUTHOR_WARNING
"The ${_vtk_module_generate_spdx_MODULE_NAME} module should have a non-empty `SPDX_COPYRIGHT_TEXT`. Defaulting to NOASSERTION")
set(_vtk_module_generate_spdx_SPDX_COPYRIGHT_TEXT "NOASSERTION")
endif ()
- get_property(_vtk_module_generate_spdx_SPDX_CUSTOM_LICENSE_FILE GLOBAL PROPERTY "_vtk_module_${_vtk_build_module}_spdx_custom_license_file")
- get_property(_vtk_module_generate_spdx_SPDX_CUSTOM_LICENSE_NAME GLOBAL PROPERTY "_vtk_module_${_vtk_build_module}_spdx_custom_license_name")
+ get_property(_vtk_module_generate_spdx_SPDX_CUSTOM_LICENSE_FILE GLOBAL
+ PROPERTY "_vtk_module_${_vtk_build_module}_spdx_custom_license_file")
+ get_property(_vtk_module_generate_spdx_SPDX_CUSTOM_LICENSE_NAME GLOBAL
+ PROPERTY "_vtk_module_${_vtk_build_module}_spdx_custom_license_name")
if (NOT _vtk_build_SPDX_DOCUMENT_NAMESPACE)
message(AUTHOR_WARNING
@@ -5905,7 +5908,8 @@ function (_vtk_module_generate_spdx)
endif ()
set(_vtk_module_generate_spdx_namespace ${_vtk_build_SPDX_DOCUMENT_NAMESPACE}/${_vtk_module_generate_spdx_MODULE_NAME})
- get_property(_vtk_module_generate_spdx_download_location GLOBAL PROPERTY "_vtk_module_${_vtk_build_module}_spdx_download_location")
+ get_property(_vtk_module_generate_spdx_download_location GLOBAL
+ PROPERTY "_vtk_module_${_vtk_build_module}_spdx_download_location")
if (NOT _vtk_module_generate_spdx_download_location)
if (NOT _vtk_build_SPDX_DOWNLOAD_LOCATION)
message(AUTHOR_WARNING
@@ -5917,20 +5921,20 @@ function (_vtk_module_generate_spdx)
endif ()
endif ()
-
set(_vtk_module_generate_spdx_args_file)
set(_vtk_module_generate_spdx_response_arg)
- if(_vtk_module_generate_spdx_INPUT_FILES)
+ if (_vtk_module_generate_spdx_INPUT_FILES)
set(_vtk_module_generate_spdx_args_file
"${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${_vtk_module_generate_spdx_TARGET}/${_vtk_module_generate_spdx_MODULE_NAME}-spdx.$<CONFIGURATION>.args")
file(GENERATE
OUTPUT "${_vtk_module_generate_spdx_args_file}"
CONTENT "$<JOIN:${_vtk_module_generate_spdx_INPUT_FILES},\n>")
set(_vtk_module_generate_spdx_response_arg "@${_vtk_module_generate_spdx_args_file}")
- endif()
+ endif ()
- add_custom_command(OUTPUT ${_vtk_module_generate_spdx_output_file}
+ add_custom_command(
+ OUTPUT "${_vtk_module_generate_spdx_output_file}"
COMMAND "$<TARGET_FILE:Python3::Interpreter>" -Xutf8 "${_vtkModule_dir}/SPDX_generate_output.py"
-m "${_vtk_module_generate_spdx_MODULE_NAME}"
-l "${_vtk_module_generate_spdx_SPDX_LICENSE_IDENTIFIER}"
@@ -5943,7 +5947,7 @@ function (_vtk_module_generate_spdx)
-d "${_vtk_module_generate_spdx_download_location}"
-k "${_vtk_module_generate_spdx_SKIP_REGEX}"
${_vtk_module_generate_spdx_response_arg}
- VERBATIM)
+ VERBATIM)
add_custom_target(${_vtk_module_generate_spdx_TARGET}
DEPENDS
"${_vtk_module_generate_spdx_output_file}"
--
GitLab