Skip to content

Commit

Permalink
compatibility fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
jhrutgers committed Jan 18, 2024
1 parent 1f1b0af commit 1fe1375
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion cmake/sbom.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ Relationship: SPDXRef-DOCUMENT DESCRIBES SPDXRef-${SBOM_GENERATE_PROJECT}
)
endif()

install(CODE "set(SBOM_VERIFICATION_CODES)")
install(CODE "set(SBOM_VERIFICATION_CODES \"\")")

set_property(GLOBAL PROPERTY SBOM_FILENAME "${SBOM_GENERATE_OUTPUT}")
set(SBOM_FILENAME
Expand Down
2 changes: 1 addition & 1 deletion dist/common/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@

reuse
poetry-core; python_version < '3.9' # build dep for reuse
spdx-tools
spdx-tools>=0.8.0
ntia-conformance-checker
6 changes: 3 additions & 3 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
#
# SPDX-License-Identifier: MIT

if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.17)
if(NOT CMAKE_VERSION VERSION_LESS 3.17)
set(rmdir rm -rf)
else()
set(rmdir "remove_directory")
endif()

add_custom_target(test ALL)
add_custom_target(tests ALL)

sbom_find_python(REQUIRED)

Expand Down Expand Up @@ -40,7 +40,7 @@ project(${name})"
VERBATIM
)

add_dependencies(test test-${name})
add_dependencies(tests test-${name})
endfunction()

test(minimal)
Expand Down

0 comments on commit 1fe1375

Please sign in to comment.