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

[devil] Fix pkgconfig on Windows (#14793)

Browse Source
This commit is contained in:
Jack·Boos·Yu 2020-11-30 11:00:02 -08:00 committed by GitHub
parent 9202f7fa54
commit 8f7de27b24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 56 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
ports/devil/0005-fix-pkgconfig.patch Normal file
View File

@ -0,0 +1,52 @@
diff --git a/DevIL/src-IL/CMakeLists.txt b/DevIL/src-IL/CMakeLists.txt
index 4accaa1..c3a1874 100644
--- a/DevIL/src-IL/CMakeLists.txt
+++ b/DevIL/src-IL/CMakeLists.txt
@@ -160,6 +160,27 @@ if(WIN32)
# Linux uses libIL.so, libILU.so, and libILUT.so, but Windows uses
# DevIL.dll, ILU.dll, and ILUT.dll.
set_target_properties(IL PROPERTIES OUTPUT_NAME "DevIL")
+
+ configure_file(${CMAKE_CURRENT_LIST_DIR}/pkgconfig/IL.pc.cmake.in ${CMAKE_CURRENT_LIST_DIR}/pkgconfig/DevIL.pc.cmake.in COPYONLY)
+
+ file(READ ${CMAKE_CURRENT_LIST_DIR}/pkgconfig/DevIL.pc.cmake.in PKGCONFIG_FILE)
+ string(REPLACE "IL" "DevIL" PKGCONFIG_FILE "${PKGCONFIG_FILE}")
+ file(WRITE ${CMAKE_CURRENT_LIST_DIR}/pkgconfig/DevIL.pc.cmake.in "${PKGCONFIG_FILE}")
+
+ file(READ ${CMAKE_CURRENT_LIST_DIR}/../src-ILU/pkgconfig/ILU.pc.cmake.in PKGCONFIG_FILE)
+ string(REPLACE "Requires: IL" "Requires: DevIL" PKGCONFIG_FILE "${PKGCONFIG_FILE}")
+ string(REPLACE "Libs.private: -lIL" "Libs.private: -lDevIL" PKGCONFIG_FILE "${PKGCONFIG_FILE}")
+ file(WRITE ${CMAKE_CURRENT_LIST_DIR}/../src-ILU/pkgconfig/ILU.pc.cmake.in "${PKGCONFIG_FILE}")
+
+ file(READ ${CMAKE_CURRENT_LIST_DIR}/../src-ILUT/pkgconfig/ILUT.pc.cmake.in PKGCONFIG_FILE)
+ string(REPLACE "Requires: IL" "Requires: DevIL" PKGCONFIG_FILE "${PKGCONFIG_FILE}")
+ string(REPLACE "Libs.private: -lIL" "Libs.private: -lDevIL" PKGCONFIG_FILE "${PKGCONFIG_FILE}")
+ file(WRITE ${CMAKE_CURRENT_LIST_DIR}/../src-ILUT/pkgconfig/ILUT.pc.cmake.in "${PKGCONFIG_FILE}")
+ set(PKGCFG_IN_FILE pkgconfig/DevIL.pc.cmake.in)
+ set(PKGCFG_FILE DevIL.pc)
+else(WIN32)
+ set(PKGCFG_IN_FILE pkgconfig/IL.pc.cmake.in)
+ set(PKGCFG_FILE IL.pc)
endif(WIN32)
if(UNICODE)
@@ -246,8 +267,8 @@ endif()
# TODO: add Requires.private or Libs.private
# (needed to support static linking?)
# TODO: sort out version number
-configure_file( pkgconfig/IL.pc.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/IL.pc @ONLY)
+configure_file( ${PKGCFG_IN_FILE}
+ ${CMAKE_CURRENT_BINARY_DIR}/${PKGCFG_FILE} @ONLY)
# Installation
@@ -259,7 +280,7 @@ install (TARGETS IL
install (FILES ../include/IL/il.h DESTINATION include/IL)
install(FILES
- ${CMAKE_CURRENT_BINARY_DIR}/IL.pc
+ ${CMAKE_CURRENT_BINARY_DIR}/${PKGCFG_FILE}
DESTINATION lib/pkgconfig
)

2
ports/devil/CONTROL
View File

@ -1,6 +1,6 @@
Source: devil
Version: 1.8.0
Port-Version: 6
Port-Version: 7
Build-Depends:
Homepage: https://github.com/DentonW/DevIL
Description: A full featured cross-platform image library

3
ports/devil/portfile.cmake
View File

@ -10,6 +10,7 @@ vcpkg_from_github(
0003_fix-openexr.patch
enable-static.patch
0004_compatible-jasper-2-0-20.patch
0005-fix-pkgconfig.patch
)
file(REMOVE ${SOURCE_PATH}/DevIL/src-IL/cmake/FindOpenEXR.cmake)
@ -39,6 +40,8 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
vcpkg_copy_pdbs()
vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
# Handle copyright