[cfitsio] fix uwp build (microsoft#35009)

m-kuhn · Nov 15, 2023 · ced9a67 · ced9a67
1 parent 83712a6
commit ced9a67
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 4 deletions.
diff --git a/ports/cfitsio/0006-fix-uwp.patch b/ports/cfitsio/0006-fix-uwp.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7afb480..4fcdf40 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -195,7 +195,7 @@ IF (BUILD_SHARED_LIBS)
+
+     # To expand the command line arguments in Windows, see:
+     # http://msdn.microsoft.com/en-us/library/8bch7bkk.aspx
+-    if(MSVC)
++    if(MSVC AND NOT CMAKE_SYSTEM_NAME MATCHES "WindowsStore")
+       set_target_properties(FPack Funpack PROPERTIES LINK_FLAGS "setargv.obj")
+     endif(MSVC)
+
diff --git a/ports/cfitsio/portfile.cmake b/ports/cfitsio/portfile.cmake
@@ -13,6 +13,7 @@ vcpkg_extract_source_archive(
         0003-add-Wno-error-implicit-funciton-declaration-to-cmake.patch
         0004-pkg-config.patch
         0005-fix-link2019-error.patch
+        0006-fix-uwp.patch
 )
 
 vcpkg_check_features(

diff --git a/ports/cfitsio/vcpkg.json b/ports/cfitsio/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "cfitsio",
   "version": "3.49",
-  "port-version": 4,
+  "port-version": 5,
   "description": "Library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data format",
   "homepage": "https://heasarc.gsfc.nasa.gov/fitsio/",
   "dependencies": [

diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
@@ -145,8 +145,6 @@ catch-classic:x86-windows        = skip
 cctag:x64-windows-static-md=fail
 cello:arm64-uwp=fail
 cello:x64-uwp=fail
-cfitsio:arm64-uwp=fail
-cfitsio:x64-uwp=fail
 chakracore:x64-linux=skip
 # DCMTK currently has a vendored copy of libcharls.a, which causes conflicts with charls (TODO: use charls' copy)
 charls:arm64-windows=skip

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -1506,7 +1506,7 @@
     },
     "cfitsio": {
       "baseline": "3.49",
-      "port-version": 4
+      "port-version": 5
     },
     "cgal": {
       "baseline": "5.6",

diff --git a/versions/c-/cfitsio.json b/versions/c-/cfitsio.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "373230dbd5e9968b5efd6b9d7227accc836b840f",
+      "version": "3.49",
+      "port-version": 5
+    },
     {
       "git-tree": "b2df854891a5beda50e8cf8004a7af0766c5c5bc",
       "version": "3.49",