diff options
| author | Friedrich W. H. Kossebau <kossebau@kde.org> | 2021-02-26 21:48:38 +0000 |
|---|---|---|
| committer | Christophe Giboudeaux <christophe@krop.fr> | 2021-02-26 21:48:38 +0000 |
| commit | dce13260f831882f70a18b1f1290bac462befbbd (patch) | |
| tree | 69e1bcb5c8e5aaae1c0ab93df910ac8c34565e67 | |
| parent | 3ee63fed9cb6e063e3ac0fc0d9763fafd85df7e2 (diff) | |
| download | extra-cmake-modules-dce13260f831882f70a18b1f1290bac462befbbd.tar.gz extra-cmake-modules-dce13260f831882f70a18b1f1290bac462befbbd.tar.bz2 | |
Fix ECMCheckOutboundLicenseTest to find the FindReuseTool.cmake filev5.80.0-rc1v5.80.0
| -rw-r--r-- | modules/ECMCheckOutboundLicense.cmake | 1 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tests/ECMCheckOutboundLicenseTest/CMakeLists.txt | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/modules/ECMCheckOutboundLicense.cmake b/modules/ECMCheckOutboundLicense.cmake index 0397a023..c49a190d 100644 --- a/modules/ECMCheckOutboundLicense.cmake +++ b/modules/ECMCheckOutboundLicense.cmake @@ -130,7 +130,6 @@ function(ecm_check_outbound_license) # generate file with list of relative file paths string(REPLACE "${CMAKE_BINARY_DIR}/" "" RELATIVE_PREFIX_PATH ${CMAKE_CURRENT_BINARY_DIR}) set(OUTPUT_FILE ${CMAKE_BINARY_DIR}/licensecheck_${ARG_TEST_NAME}.txt) - message(STATUS "Generate test input file: ${OUTPUT_FILE}") file(REMOVE ${OUTPUT_FILE}) foreach(_file ${ARG_FILES}) # check script expects files to start with "./", which must be relative to CMAKE_SOURCE_DIR diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index fff7d988..b2143ec9 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -60,9 +60,6 @@ endmacro() list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/find-modules) -# enforce finding of ReuseTool in parent scope of module, beause -# only here the module path can point into the source directory -find_package(ReuseTool) add_subdirectory(ECMCheckOutboundLicenseTest) # Skip if PyQt not available diff --git a/tests/ECMCheckOutboundLicenseTest/CMakeLists.txt b/tests/ECMCheckOutboundLicenseTest/CMakeLists.txt index 1aab9a58..454e7991 100644 --- a/tests/ECMCheckOutboundLicenseTest/CMakeLists.txt +++ b/tests/ECMCheckOutboundLicenseTest/CMakeLists.txt @@ -1,5 +1,9 @@ set(ECM_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../modules) -set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../modules) +set(CMAKE_MODULE_PATH + ${CMAKE_CURRENT_SOURCE_DIR}/../../modules + ${CMAKE_CURRENT_SOURCE_DIR}/../../find-modules +) + include(ECMCheckOutboundLicense) # check relative and absolute input paths |