From 3de1bfe0df18adcff99b2a98fd3f47b7eaab47d2 Mon Sep 17 00:00:00 2001 From: Ropufu Date: Sun, 1 Aug 2021 13:17:59 -0400 Subject: [PATCH] Uniform licenses location; readme's are back. --- CMakeLists.txt | 19 ++++++++++--------- Packaging/resources/README-SDL.txt | 13 +++++++++++++ 2 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 Packaging/resources/README-SDL.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index bfecdcb3f..6350a180f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -946,11 +946,16 @@ if(CPACK) set(SDL2_WIN32_LICENSES_DIR "${PROJECT_SOURCE_DIR}/Packaging/resources") else() set(SDL2_WIN32_DLLS_DIR "${SDL2_EXEC_PREFIX}/bin") - set(SDL2_WIN32_LICENSES_DIR "${SDL2_EXEC_PREFIX}/bin") + set(SDL2_WIN32_LICENSES_DIR "${PROJECT_SOURCE_DIR}/Packaging/resources") endif() - file(GLOB SDL2_WIN32_ALL_DLLS "${SDL2_WIN32_DLLS_DIR}/*.dll") - file(GLOB SDL2_WIN32_ALL_LICENSES "${SDL2_WIN32_LICENSES_DIR}/LICENSE*.txt") + file(GLOB SDL2_WIN32_ALL_DLLS + LIST_DIRECTORIES false + "${SDL2_WIN32_DLLS_DIR}/*.dll") + file(GLOB SDL2_WIN32_ALL_LICENSES + LIST_DIRECTORIES false + "${SDL2_WIN32_LICENSES_DIR}/LICENSE*.txt" + "${SDL2_WIN32_LICENSES_DIR}/README*.txt") set(CPACK_PACKAGE_FILE_NAME "devilutionx") set(CPACK_PACKAGE_NAME ${project_name}) @@ -967,22 +972,18 @@ if(CPACK) DESTINATION "." ) - foreach (_SDL2_WIN32_DLL_PATH ${SDL2_WIN32_ALL_DLLS}) + foreach(_SDL2_WIN32_DLL_PATH ${SDL2_WIN32_ALL_DLLS}) install(FILES "${_SDL2_WIN32_DLL_PATH}" DESTINATION "." ) endforeach() - foreach (_SDL2_WIN32_LICENSE_PATH ${SDL2_WIN32_ALL_LICENSES}) + foreach(_SDL2_WIN32_LICENSE_PATH ${SDL2_WIN32_ALL_LICENSES}) install(FILES "${_SDL2_WIN32_LICENSE_PATH}" DESTINATION "LICENSE" ) endforeach() - install(FILES "${PROJECT_SOURCE_DIR}/Packaging/resources/LICENSE.CharisSILB.txt" - DESTINATION "LICENSE" - ) - elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") string(TOLOWER ${PROJECT_NAME} project_name) set(CPACK_PACKAGE_NAME ${project_name}) diff --git a/Packaging/resources/README-SDL.txt b/Packaging/resources/README-SDL.txt new file mode 100644 index 000000000..8d92955a9 --- /dev/null +++ b/Packaging/resources/README-SDL.txt @@ -0,0 +1,13 @@ + +Please distribute this file with the SDL runtime environment: + +The Simple DirectMedia Layer (SDL for short) is a cross-platform library +designed to make it easy to write multi-media software, such as games +and emulators. + +The Simple DirectMedia Layer library source code is available from: +https://www.libsdl.org/ + +This library is distributed under the terms of the zlib license: +http://www.zlib.net/zlib_license.html +