Skip to content

Commit 7285911

Browse files
committed
release: fix typo and add missing macro in MSVC's CMake configuration files
1 parent be94566 commit 7285911

2 files changed

Lines changed: 14 additions & 3 deletions

File tree

build-scripts/pkg-support/android/aar/cmake/SDL3_ttfConfig.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SDL CMake configuration file:
22
# This file is meant to be placed in lib/cmake/SDL3_ttf subfolder of a reconstructed Android SDL3_ttf SDK
33

4-
cmake_minimum_required(VERSION 3.0...3.28)
4+
cmake_minimum_required(VERSION 3.0...4.0)
55

66
include(FeatureSummary)
77
set_package_properties(SDL3_ttf PROPERTIES

build-scripts/pkg-support/msvc/cmake/SDL3_ttfConfig.cmake.in

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,24 @@
11
# @<@PROJECT_NAME@>@ CMake configuration file:
22
# This file is meant to be placed in a cmake subfolder of @<@PROJECT_NAME@>@-devel-@<@PROJECT_VERSION@>@-VC.zip
33

4+
cmake_minimum_required(VERSION 3.0...4.0)
5+
46
include(FeatureSummary)
57
set_package_properties(SDL3_ttf PROPERTIES
68
URL "https://www.libsdl.org/projects/SDL_ttf/"
79
DESCRIPTION "Support for TrueType (.ttf) font files with Simple Directmedia Layer"
810
)
911

10-
cmake_minimum_required(VERSION 3.0...3.28)
12+
# Copied from `configure_package_config_file`
13+
macro(check_required_components _NAME)
14+
foreach(comp ${${_NAME}_FIND_COMPONENTS})
15+
if(NOT ${_NAME}_${comp}_FOUND)
16+
if(${_NAME}_FIND_REQUIRED_${comp})
17+
set(${_NAME}_FOUND FALSE)
18+
endif()
19+
endif()
20+
endforeach()
21+
endmacro()
1122

1223
set(SDL3_ttf_FOUND TRUE)
1324

@@ -56,7 +67,7 @@ unset(_sdl3_ttf_dll)
5667
set(SDL3_ttf_SDL3_ttf-static_FOUND TRUE)
5768

5869
set(SDL3_ttf_SDL3_ttf_FOUND FALSE)
59-
if(SDL3_ttf_SDL3_ttf-hared_FOUND OR SDL3_ttf_SDL3_ttf-static_FOUND)
70+
if(SDL3_ttf_SDL3_ttf-shared_FOUND OR SDL3_ttf_SDL3_ttf-static_FOUND)
6071
set(SDL3_ttf_SDL3_ttf_FOUND TRUE)
6172
endif()
6273

0 commit comments

Comments
 (0)