diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-11-30 11:00:02 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-30 11:00:02 -0800 |
| commit | 8f7de27b24a616fc44bcd2beee9007ffd79d32f9 (patch) | |
| tree | 9ac375c5a0da513732beed555cc5a04808e5d2f2 | |
| parent | 9202f7fa54e146774d2dabab44efe1c9cbb255e4 (diff) | |
| download | vcpkg-8f7de27b24a616fc44bcd2beee9007ffd79d32f9.tar.gz vcpkg-8f7de27b24a616fc44bcd2beee9007ffd79d32f9.zip | |
[devil] Fix pkgconfig on Windows (#14793)
| -rw-r--r-- | ports/devil/0005-fix-pkgconfig.patch | 52 | ||||
| -rw-r--r-- | ports/devil/CONTROL | 2 | ||||
| -rw-r--r-- | ports/devil/portfile.cmake | 3 |
3 files changed, 56 insertions, 1 deletions
diff --git a/ports/devil/0005-fix-pkgconfig.patch b/ports/devil/0005-fix-pkgconfig.patch new file mode 100644 index 000000000..d45af68f7 --- /dev/null +++ b/ports/devil/0005-fix-pkgconfig.patch @@ -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 + ) + diff --git a/ports/devil/CONTROL b/ports/devil/CONTROL index 00b069a4f..980c91e1b 100644 --- a/ports/devil/CONTROL +++ b/ports/devil/CONTROL @@ -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 diff --git a/ports/devil/portfile.cmake b/ports/devil/portfile.cmake index c2d098625..36a5dfccd 100644 --- a/ports/devil/portfile.cmake +++ b/ports/devil/portfile.cmake @@ -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 |