diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2021-02-02 11:26:35 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-01 19:26:35 -0800 |
| commit | d4ba955db2b9c5060affe4480944caeaef9a8e4c (patch) | |
| tree | bd98090ca15c787a8be4563c0ae4ef1b2b58f936 | |
| parent | 8ad8ba7a21428b3a7b41dffb4c6ca78499e3e9ce (diff) | |
| download | vcpkg-d4ba955db2b9c5060affe4480944caeaef9a8e4c.tar.gz vcpkg-d4ba955db2b9c5060affe4480944caeaef9a8e4c.zip | |
[raylib] Fix usage (#15935)
* [raylib] Fix usage
* Update ports/raylib/CONTROL
* Update versions
* Update versions/r-/raylib.json
| -rw-r--r-- | ports/raylib/CONTROL | 1 | ||||
| -rw-r--r-- | ports/raylib/portfile.cmake | 6 | ||||
| -rw-r--r-- | ports/raylib/vcpkg-cmake-wrapper.cmake | 4 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/r-/raylib.json | 5 |
5 files changed, 15 insertions, 3 deletions
diff --git a/ports/raylib/CONTROL b/ports/raylib/CONTROL index d617a9189..925d94d1c 100644 --- a/ports/raylib/CONTROL +++ b/ports/raylib/CONTROL @@ -1,5 +1,6 @@ Source: raylib
Version: 3.5.0
+Port-Version: 1
Description: A simple and easy-to-use library to enjoy videogames programming
Homepage: https://github.com/raysan5/raylib
Supports: !(arm|uwp)
diff --git a/ports/raylib/portfile.cmake b/ports/raylib/portfile.cmake index a3af4172e..965d3f225 100644 --- a/ports/raylib/portfile.cmake +++ b/ports/raylib/portfile.cmake @@ -56,6 +56,12 @@ vcpkg_copy_pdbs() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
+configure_file(
+ ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake
+ ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake
+ @ONLY
+)
+
file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug/include
${CURRENT_PACKAGES_DIR}/debug/share
diff --git a/ports/raylib/vcpkg-cmake-wrapper.cmake b/ports/raylib/vcpkg-cmake-wrapper.cmake index 34484ea6f..2d7560eb0 100644 --- a/ports/raylib/vcpkg-cmake-wrapper.cmake +++ b/ports/raylib/vcpkg-cmake-wrapper.cmake @@ -2,8 +2,8 @@ include(SelectLibraryConfigurations) find_path(RAYLIB_INCLUDE_DIR raylib.h)
-find_library(RAYLIB_LIBRARY_DEBUG NAMES raylib libraylib NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH REQUIRED)
-find_library(RAYLIB_LIBRARY_RELEASE NAMES raylib libraylib NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH REQUIRED)
+find_library(RAYLIB_LIBRARY_DEBUG NAMES raylib libraylib raylib_static NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH REQUIRED)
+find_library(RAYLIB_LIBRARY_RELEASE NAMES raylib libraylib raylib_static NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH REQUIRED)
select_library_configurations(RAYLIB)
diff --git a/versions/baseline.json b/versions/baseline.json index c106dbfba..b7e89b59c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5006,7 +5006,7 @@ }, "raylib": { "baseline": "3.5.0", - "port-version": 0 + "port-version": 1 }, "rbdl": { "baseline": "2.6.0", diff --git a/versions/r-/raylib.json b/versions/r-/raylib.json index 49226f0b7..b70356c45 100644 --- a/versions/r-/raylib.json +++ b/versions/r-/raylib.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "b517bb75982839f879e33ed72c13ba824f7f7547", + "version-string": "3.5.0", + "port-version": 1 + }, + { "git-tree": "5f584abef9d068dcada1382034eac435d75fd21d", "version-string": "3.5.0", "port-version": 0 |