mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 10:21:07 +08:00
[cfitsio] fix uwp build (#35009)
This commit is contained in:
parent
83712a6060
commit
ced9a6771d
13
ports/cfitsio/0006-fix-uwp.patch
Normal file
13
ports/cfitsio/0006-fix-uwp.patch
Normal file
@ -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)
|
||||||
|
|
@ -13,6 +13,7 @@ vcpkg_extract_source_archive(
|
|||||||
0003-add-Wno-error-implicit-funciton-declaration-to-cmake.patch
|
0003-add-Wno-error-implicit-funciton-declaration-to-cmake.patch
|
||||||
0004-pkg-config.patch
|
0004-pkg-config.patch
|
||||||
0005-fix-link2019-error.patch
|
0005-fix-link2019-error.patch
|
||||||
|
0006-fix-uwp.patch
|
||||||
)
|
)
|
||||||
|
|
||||||
vcpkg_check_features(
|
vcpkg_check_features(
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "cfitsio",
|
"name": "cfitsio",
|
||||||
"version": "3.49",
|
"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",
|
"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/",
|
"homepage": "https://heasarc.gsfc.nasa.gov/fitsio/",
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
|
@ -145,8 +145,6 @@ catch-classic:x86-windows = skip
|
|||||||
cctag:x64-windows-static-md=fail
|
cctag:x64-windows-static-md=fail
|
||||||
cello:arm64-uwp=fail
|
cello:arm64-uwp=fail
|
||||||
cello:x64-uwp=fail
|
cello:x64-uwp=fail
|
||||||
cfitsio:arm64-uwp=fail
|
|
||||||
cfitsio:x64-uwp=fail
|
|
||||||
chakracore:x64-linux=skip
|
chakracore:x64-linux=skip
|
||||||
# DCMTK currently has a vendored copy of libcharls.a, which causes conflicts with charls (TODO: use charls' copy)
|
# DCMTK currently has a vendored copy of libcharls.a, which causes conflicts with charls (TODO: use charls' copy)
|
||||||
charls:arm64-windows=skip
|
charls:arm64-windows=skip
|
||||||
|
@ -1506,7 +1506,7 @@
|
|||||||
},
|
},
|
||||||
"cfitsio": {
|
"cfitsio": {
|
||||||
"baseline": "3.49",
|
"baseline": "3.49",
|
||||||
"port-version": 4
|
"port-version": 5
|
||||||
},
|
},
|
||||||
"cgal": {
|
"cgal": {
|
||||||
"baseline": "5.6",
|
"baseline": "5.6",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "373230dbd5e9968b5efd6b9d7227accc836b840f",
|
||||||
|
"version": "3.49",
|
||||||
|
"port-version": 5
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "b2df854891a5beda50e8cf8004a7af0766c5c5bc",
|
"git-tree": "b2df854891a5beda50e8cf8004a7af0766c5c5bc",
|
||||||
"version": "3.49",
|
"version": "3.49",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user