aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>2021-06-10 08:06:31 +0800
committerGitHub <noreply@github.com>2021-06-09 17:06:31 -0700
commit6fd8355aff98b2560eb16ff720c1ea4baf11e4b7 (patch)
treeaad9ad23889afee8d61a330c671216f247be3a56
parent40ad15cac149690c7b261d3273e30ca78208e3c8 (diff)
downloadvcpkg-6fd8355aff98b2560eb16ff720c1ea4baf11e4b7.tar.gz
vcpkg-6fd8355aff98b2560eb16ff720c1ea4baf11e4b7.zip
[ccfits] Fix usage (#18197)
* [ccfits] Fix usage * update version * fix header name * update baseline record
-rw-r--r--ports/ccfits/CONTROL6
-rw-r--r--ports/ccfits/portfile.cmake4
-rw-r--r--ports/ccfits/vcpkg.json10
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/c-/ccfits.json5
5 files changed, 20 insertions, 7 deletions
diff --git a/ports/ccfits/CONTROL b/ports/ccfits/CONTROL
deleted file mode 100644
index 4fbc3ad80..000000000
--- a/ports/ccfits/CONTROL
+++ /dev/null
@@ -1,6 +0,0 @@
-Source: ccfits
-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/portfile.cmake b/ports/ccfits/portfile.cmake
index 2071e4af8..e18760401 100644
--- a/ports/ccfits/portfile.cmake
+++ b/ports/ccfits/portfile.cmake
@@ -39,5 +39,9 @@ foreach(HEADER IN LISTS HEADERS)
file(WRITE "${HEADER}" "${_contents}")
endforeach()
+vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/CCfits/CCfits.h
+ "#include \"longnam.h\"" "#include \"cfitsio/longnam.h\""
+)
+
# Handle copyright
file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/ccfits/vcpkg.json b/ports/ccfits/vcpkg.json
new file mode 100644
index 000000000..d8280a158
--- /dev/null
+++ b/ports/ccfits/vcpkg.json
@@ -0,0 +1,10 @@
+{
+ "name": "ccfits",
+ "version": "2.5",
+ "port-version": 7,
+ "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++.",
+ "homepage": "https://heasarc.gsfc.nasa.gov/fitsio/ccfits",
+ "dependencies": [
+ "cfitsio"
+ ]
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 5a96b9aa6..a590b45be 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1154,7 +1154,7 @@
},
"ccfits": {
"baseline": "2.5",
- "port-version": 6
+ "port-version": 7
},
"cctz": {
"baseline": "2.3-2",
diff --git a/versions/c-/ccfits.json b/versions/c-/ccfits.json
index a1a5ba604..d7b390aa7 100644
--- a/versions/c-/ccfits.json
+++ b/versions/c-/ccfits.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "adb43da4a1d72e0924081e4699d81337d649400e",
+ "version": "2.5",
+ "port-version": 7
+ },
+ {
"git-tree": "c72b341528629e93108ce5317dd3802dc9b4ac11",
"version-string": "2.5",
"port-version": 6