diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-10-17 02:05:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-17 02:05:12 -0700 |
| commit | 32c5722104fc28cd55d166a2c04e1d44906eec68 (patch) | |
| tree | 7c688990b7f6b50f119ef88c746c3ac2e1897a0b /ports/ccfits | |
| parent | 0b5b24698f08f6f4ca0ef984b2ae9d6a6ba0d7a6 (diff) | |
| download | vcpkg-32c5722104fc28cd55d166a2c04e1d44906eec68.tar.gz vcpkg-32c5722104fc28cd55d166a2c04e1d44906eec68.zip | |
[cfitsio] Update to 3.49 and fix dependency zlib (#14064)
* [cfitsio] Update to 3.49 and fix dependency zlib
* export unofficial cmake targets
* [cfitsio] Fix file paths, export cmake targets
* [cfitsio] Required cmake_policy CMP0012
* [ccfits] Fix dependency cfitsio
* [cfitsio] Fixup pkgconfig
* [healpix] Fix dependency cfitsio
* [cfitsio] fix homepage and patches
Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
Diffstat (limited to 'ports/ccfits')
| -rw-r--r-- | ports/ccfits/CONTROL | 3 | ||||
| -rw-r--r-- | ports/ccfits/fix-dependency.patch | 15 | ||||
| -rw-r--r-- | ports/ccfits/portfile.cmake | 4 |
3 files changed, 20 insertions, 2 deletions
diff --git a/ports/ccfits/CONTROL b/ports/ccfits/CONTROL index 02234c94e..4fbc3ad80 100644 --- a/ports/ccfits/CONTROL +++ b/ports/ccfits/CONTROL @@ -1,5 +1,6 @@ Source: ccfits -Version: 2.5-5 +Version: 2.5 +Port-Version: 6 Homepage: https://heasarc.gsfc.nasa.gov/fitsio/ccfits Description: CCfits is an object oriented interface to the cfitsio library. It is designed to make the capabilities of cfitsio available to programmers working in C++. Build-Depends: cfitsio diff --git a/ports/ccfits/fix-dependency.patch b/ports/ccfits/fix-dependency.patch new file mode 100644 index 000000000..15cffeb4e --- /dev/null +++ b/ports/ccfits/fix-dependency.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d72ae85..405d96b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -22,8 +22,8 @@ ENDIF() + + #add_subdirectory (src) + +-find_package(CFITSIO REQUIRED) +-INCLUDE_DIRECTORIES(${CFITSIO_INCLUDE_DIR}) ++find_package(unofficial-cfitsio CONFIG REQUIRED) ++set(CFITSIO_LIBRARY cfitsio) + + SET (LIB_TYPE STATIC) + IF (BUILD_SHARED_LIBS) diff --git a/ports/ccfits/portfile.cmake b/ports/ccfits/portfile.cmake index 6c33b383b..2071e4af8 100644 --- a/ports/ccfits/portfile.cmake +++ b/ports/ccfits/portfile.cmake @@ -7,7 +7,9 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( ARCHIVE ${ARCHIVE} OUT_SOURCE_PATH SOURCE_PATH - PATCHES dll_exports.patch + PATCHES + dll_exports.patch + fix-dependency.patch ) vcpkg_configure_cmake( |