3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 10:21:07 +08:00
Code Issues Projects Releases Wiki Activity

[irrlicht] Add the remind of libraries which needed by Linux (#21511)

Browse Source 
* [irrlicht] Add the remind of libraries which needed by Linux

* update version

* [irrlicht] update mesa

* update version

* update version

* update portfile.cmake

* update version

Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
This commit is contained in:
LilyWangLL 2022-01-21 02:30:30 +08:00 committed by GitHub
parent 0a3b3d462d
commit 1028f966a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ports/irrlicht/portfile.cmake
View File

@ -1,5 +1,3 @@
vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp")
vcpkg_from_sourceforge(
OUT_SOURCE_PATH SOURCE_PATH
REPO irrlicht/Irrlicht%20SDK
@ -12,7 +10,16 @@ vcpkg_from_sourceforge(
fix-osx-compilation.patch
)
configure_file(${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY)
if(VCPKG_TARGET_IS_LINUX)
message(
"Irrlicht currently requires the following libraries from the system package manager:
libgl1-mesa
xf86vmode
These can be installed on Ubuntu systems via sudo apt-get install libgl1-mesa-dev libxxf86vm-dev")
endif()
configure_file("${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" "${SOURCE_PATH}/CMakeLists.txt" COPYONLY)
vcpkg_check_features(
OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@ -25,7 +32,7 @@ vcpkg_check_features(
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED_LIB)
vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DIRR_SHARED_LIB=${SHARED_LIB}
${FEATURE_OPTIONS}
@ -36,15 +43,15 @@ vcpkg_cmake_install()
vcpkg_cmake_config_fixup()
if("tools" IN_LIST FEATURES)
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/irrlicht/)
vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/irrlicht/")
endif()
file(WRITE ${CURRENT_PACKAGES_DIR}/share/irrlicht/irrlicht-config.cmake "include(\${CMAKE_CURRENT_LIST_DIR}/irrlicht-targets.cmake)")
file(WRITE "${CURRENT_PACKAGES_DIR}/share/irrlicht/irrlicht-config.cmake" "include(\${CMAKE_CURRENT_LIST_DIR}/irrlicht-targets.cmake)")
vcpkg_copy_pdbs()
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/irrlicht)
file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/irrlicht")
endif()
file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

2
ports/irrlicht/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "irrlicht",
"version-string": "1.8.4",
"port-version": 12,
"port-version": 13,
"description": "The Irrlicht Engine is an open source realtime 3D engine written in C++. It is cross-platform, using D3D, OpenGL and its own software renderers.",
"homepage": "http://irrlicht.sourceforge.net",
"supports": "!(arm | uwp)",

2
versions/baseline.json
View File

@ -2906,7 +2906,7 @@
},
"irrlicht": {
"baseline": "1.8.4",
"port-version": 12
"port-version": 13
},
"irrxml": {
"baseline": "0",

5
versions/i-/irrlicht.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a824dffa239fccbb9b780c9926c91f1a25d000df",
"version-string": "1.8.4",
"port-version": 13
},
{
"git-tree": "fd24be00084e5387a0ae764c42621977340ec74b",
"version-string": "1.8.4",