-
Notifications
You must be signed in to change notification settings - Fork 6.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[tgui] Fix usage and update to 0.9.1 (#17093)
* [tgui] Fix usage * update version record * update to 0.9.1 * update version record * [tgui] Add feature sdl2 and sfml, fix dependencies * add comment * version * fix gui-builder build * Update versions/t-/tgui.json * Update ports/tgui/vcpkg.json * update manifest * update to latest commit * update version record * Update versions/baseline.json
- Loading branch information
Showing
7 changed files
with
123 additions
and
31 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| diff --git a/src/Backends/SDL/CMakeLists.txt b/src/Backends/SDL/CMakeLists.txt | ||
| index d86f11d..1e31e21 100644 | ||
| --- a/src/Backends/SDL/CMakeLists.txt | ||
| +++ b/src/Backends/SDL/CMakeLists.txt | ||
| @@ -1,10 +1,10 @@ | ||
| list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake_modules) | ||
|
|
||
| -find_package(SDL2 REQUIRED) | ||
| -find_package(SDL2_ttf REQUIRED) | ||
| +find_package(SDL2 CONFIG REQUIRED) | ||
| +find_package(sdl2-ttf CONFIG REQUIRED) | ||
|
|
||
| # Link to SDL and set include and library search directories | ||
| -target_link_libraries(tgui PRIVATE SDL2::Core SDL2::TTF) | ||
| +target_link_libraries(tgui PRIVATE SDL2::SDL2 SDL2::SDL2_ttf) | ||
|
|
||
| # Add the backend source files to the library | ||
| target_sources(tgui PRIVATE | ||
| @@ -19,7 +19,7 @@ target_sources(tgui PRIVATE | ||
| ) | ||
|
|
||
| add_library(tgui-sdl-interface INTERFACE) | ||
| -target_link_libraries(tgui-sdl-interface INTERFACE SDL2::Core SDL2::TTF SDL2::Main) | ||
| +target_link_libraries(tgui-sdl-interface INTERFACE SDL2::SDL2 SDL2::SDL2_ttf SDL2::SDL2main) | ||
|
|
||
| # Also link to OpenGL or OpenGL ES | ||
| if(NOT TGUI_USE_GLES) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| diff --git a/cmake/TGUIConfig.cmake.in b/cmake/TGUIConfig.cmake.in | ||
| index 63e8a45..01804cd 100644 | ||
| --- a/cmake/TGUIConfig.cmake.in | ||
| +++ b/cmake/TGUIConfig.cmake.in | ||
| @@ -44,6 +44,9 @@ | ||
| # add_executable(myapp ...) | ||
| # target_link_libraries(myapp tgui) | ||
|
|
||
| +include(CMakeFindDependencyMacro) | ||
| +find_dependency(SFML COMPONENTS graphics CONFIG) | ||
| + | ||
| set(FIND_TGUI_PATHS | ||
| "${CMAKE_CURRENT_LIST_DIR}/../.." | ||
| ${TGUI_ROOT} | ||
| @@ -58,7 +61,7 @@ set(FIND_TGUI_PATHS | ||
| /opt) | ||
|
|
||
| # Choose which target definitions must be imported | ||
| -if (TGUI_STATIC_LIBRARIES) | ||
| +if (NOT @TGUI_SHARED_LIBS@) | ||
| set(TGUI_IS_FRAMEWORK_INSTALL "@TGUI_BUILD_FRAMEWORKS@") | ||
| if (TGUI_IS_FRAMEWORK_INSTALL) | ||
| message(WARNING "Static frameworks are not supported by TGUI. Clear TGUI_DIR cache entry, \ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| { | ||
| "name": "tgui", | ||
| "version-date": "2021-04-19", | ||
| "description": "TGUI is an easy to use, cross-platform, C++ GUI for SFML.", | ||
| "homepage": "https://tgui.eu", | ||
| "default-features": [ | ||
| "sdl2", | ||
| "sfml" | ||
| ], | ||
| "features": { | ||
| "sdl2": { | ||
| "description": "build the SDL backend", | ||
| "dependencies": [ | ||
| "sdl2", | ||
| "sdl2-ttf" | ||
| ] | ||
| }, | ||
| "sfml": { | ||
| "description": "build the SFML backend", | ||
| "dependencies": [ | ||
| { | ||
| "name": "glad", | ||
| "features": [ | ||
| "egl" | ||
| ], | ||
| "platform": "!android & !ios" | ||
| }, | ||
| { | ||
| "name": "opengl", | ||
| "platform": "android | ios" | ||
| }, | ||
| "sfml", | ||
| "stb" | ||
| ] | ||
| }, | ||
| "tool": { | ||
| "description": "Build GUI builder" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters