mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 05:49:08 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[soil2] Update version (#18453)

Browse Source 
* [soil2] Update version

* update version files

* Update ports/soil2/CONTROL

* update control file

* [soil2] Remove CMake version support

* Remove CMake version copy

* update version

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Co-authored-by: Jonliu1993 <13720414433@163.com>
Co-authored-by: Robert Schumacher <ras0219@outlook.com>
This commit is contained in:
Stijn Herfst 2021-07-23 07:13:18 +02:00 committed by GitHub
parent 92bbf7b331
commit 549d7cd664
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 36 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
ports/soil2/CMakeLists.txt
View File

@ -13,27 +13,27 @@ set(INSTALL_CMAKE_DIR share/soil2)
# Set the source files to compile
set(SOIL2_SRC
src/SOIL2/etc1_utils.c
src/SOIL2/image_DXT.c
src/SOIL2/image_helper.c
src/SOIL2/SOIL2.c
)
# Set the soil2 headers
set(SOIL2_HEADERS
src/SOIL2/SOIL2.h
src/SOIL2/etc1_utils.h
src/SOIL2/image_DXT.h
src/SOIL2/image_helper.h
src/SOIL2/jo_jpeg.h
src/SOIL2/pkm_helper.h
src/SOIL2/pvr_helper.h
src/SOIL2/stb_image.h
src/SOIL2/stb_image_write.h
src/SOIL2/stbi_DDS.h
src/SOIL2/stbi_ext.h
src/SOIL2/stbi_pkm.h
src/SOIL2/stbi_pvr.h
"src/SOIL2/image_DXT.c"
"src/SOIL2/image_DXT.h"
"src/SOIL2/image_helper.c"
"src/SOIL2/image_helper.h"
"src/SOIL2/jo_jpeg.h"
"src/SOIL2/pkm_helper.h"
"src/SOIL2/pvr_helper.h"
"src/SOIL2/SOIL2.c"
"src/SOIL2/SOIL2.h"
"src/SOIL2/stbi_DDS.h"
"src/SOIL2/stbi_DDS_c.h"
"src/SOIL2/stbi_ext.h"
"src/SOIL2/stbi_ext_c.h"
"src/SOIL2/stbi_pkm.h"
"src/SOIL2/stbi_pkm_c.h"
"src/SOIL2/stbi_pvr.h"
"src/SOIL2/stbi_pvr_c.h"
"src/SOIL2/stb_image.h"
"src/SOIL2/stb_image_write.h"
"src/SOIL2/wfETC.c"
"src/SOIL2/wfETC.h"
)
# Add the library as a static linkage
@ -58,11 +58,7 @@ if(INSTALL_HEADERS)
)
# Install the headers
install(FILES ${SOIL2_HEADERS}
DESTINATION include/SOIL2/)
# Prepare for install package files
set(SOIL2_VERSION "release-1.11")
install(FILES "src/SOIL2/SOIL2.h" DESTINATION include/SOIL2/)
# Export the stuff
export(TARGETS soil2 FILE "${PROJECT_BINARY_DIR}/soil2Targets.cmake")
@ -70,12 +66,10 @@ if(INSTALL_HEADERS)
# Create the soil2Config.cmake and soil2ConfigVersion.cmake
configure_file(soil2Config.cmake.in "${PROJECT_BINARY_DIR}/soil2Config.cmake" @ONLY)
configure_file(soil2ConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/soil2ConfigVersion.cmake" @ONLY)
# Install the soil2Config.cmake and soil2ConfigVersion.cmake
install(FILES
"${PROJECT_BINARY_DIR}/soil2Config.cmake"
"${PROJECT_BINARY_DIR}/soil2ConfigVersion.cmake"
DESTINATION "${INSTALL_CMAKE_DIR}"
)

3
ports/soil2/CONTROL
View File

@ -1,3 +0,0 @@
Source: soil2
Version: release-1.11-1
Description: Simple OpenGL Image Library 2

5
ports/soil2/portfile.cmake
View File

@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO SpartanJ/soil2
REF 7dc42acee2302780c1e100bf864aa2bdb2221a2b #release-1.11
SHA512 13f1716a3766cb4fa8d5b90eae5f3795ed3c86fc4463ca1cd68f4fa6b7fd96c24ec5098673c1d7253c94bdd491854b9359f8ccb8bd5b5640eeff3605f52e17a5
REF 51023d551d895fb4beb576d726d798ccfe358d34
SHA512 5ce8b3f04eea674cdef7ee58778e81bcefa5df7afb1013ad28dcd2d502e26915529da8bf06b751b8c350165172866e4f99d4b1081bb6c7ba04ac83a78faba83c
HEAD_REF master
)
@ -11,7 +11,6 @@ file(
${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt
${CMAKE_CURRENT_LIST_DIR}/LICENSE
${CMAKE_CURRENT_LIST_DIR}/soil2Config.cmake.in
${CMAKE_CURRENT_LIST_DIR}/soil2ConfigVersion.cmake.in
DESTINATION ${SOURCE_PATH}
)

11
ports/soil2/soil2ConfigVersion.cmake.in
View File

@ -1,11 +0,0 @@
set(PACKAGE_VERSION "@SOIL2_VERSION@")
# Check whether the requested PACKAGE_FIND_VERSION is compatible
if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
set(PACKAGE_VERSION_COMPATIBLE FALSE)
else()
set(PACKAGE_VERSION_COMPATIBLE TRUE)
if("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
set(PACKAGE_VERSION_EXACT TRUE)
endif()
endif()

6
ports/soil2/vcpkg.json Normal file
View File

@ -0,0 +1,6 @@
{
"name": "soil2",
"version-date": "2021-05-01",
"description": "Simple OpenGL Image Library 2",
"homepage": "https://github.com/SpartanJ/SOIL2"
}

2
versions/baseline.json
View File

@ -5909,7 +5909,7 @@
"port-version": 0
},
"soil2": {
"baseline": "release-1.11-1",
"baseline": "2021-05-01",
"port-version": 0
},
"sokol": {

5
versions/s-/soil2.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e72741e77acc80b5d72a64ce396f6a713548e3a1",
"version-date": "2021-05-01",
"port-version": 0
},
{
"git-tree": "79c6e11f43a4805471a2644ae07ad6e593e68646",
"version-string": "release-1.11-1",