Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[soil2] Update version #18453

Merged
merged 7 commits into from
Jul 23, 2021
Merged

[soil2] Update version #18453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7766a38
[soil2] Update version
stijnherfst Jun 14, 2021
48ca737
update version files
stijnherfst Jun 16, 2021
9bd8916
Update ports/soil2/CONTROL
JonLiu1993 Jun 17, 2021
d803baf
update control file
JonLiu1993 Jun 17, 2021
ecc1e5d
[soil2] Remove CMake version support
ras0219 Jul 1, 2021
97a25ed
Remove CMake version copy
JonLiu1993 Jul 20, 2021
b5700c6
update version
JonLiu1993 Jul 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
50 changes: 22 additions & 28 deletions ports/soil2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -58,24 +58,18 @@ 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")
export(PACKAGE soil2)

# 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}"
)

Expand Down
3 changes: 0 additions & 3 deletions ports/soil2/CONTROL
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions ports/soil2/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
)

Expand All @@ -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}
)

Expand Down
11 changes: 0 additions & 11 deletions ports/soil2/soil2ConfigVersion.cmake.in
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions ports/soil2/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "soil2",
"version-date": "2021-05-01",
"description": "Simple OpenGL Image Library 2",
"homepage": "https://github.com/SpartanJ/SOIL2"
}
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5841,7 +5841,7 @@
"port-version": 0
},
"soil2": {
"baseline": "release-1.11-1",
"baseline": "2021-05-01",
"port-version": 0
},
"sokol": {
Expand Down
5 changes: 5 additions & 0 deletions versions/s-/soil2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down