[raylib] Fix usage (#15935)

* [raylib] Fix usage * Update ports/raylib/CONTROL * Update versions * Update versions/r-/raylib.json
microsoft · Feb 2, 2021 · d4ba955 · d4ba955
1 parent 8ad8ba7
commit d4ba955
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b517bb75982839f879e33ed72c13ba824f7f7547",
+      "version-string": "3.5.0",
+      "port-version": 1
+    },
     {
       "git-tree": "5f584abef9d068dcada1382034eac435d75fd21d",
       "version-string": "3.5.0",