Skip to content

[vcpkg baseline] Move cspice headers#23272

Merged
BillyONeal merged 3 commits intomicrosoft:masterfrom
Neumann-A:move_cspice_headers
Feb 25, 2022
Merged

[vcpkg baseline] Move cspice headers#23272
BillyONeal merged 3 commits intomicrosoft:masterfrom
Neumann-A:move_cspice_headers

Conversation

@Neumann-A
Copy link
Copy Markdown
Contributor

closes #23271

@LilyWangLL LilyWangLL added the category:port-bug The issue is with a library, which is something the port should already support label Feb 25, 2022
@JackBoosY JackBoosY changed the title Move cspice headers [vcpkg baseline] Move cspice headers Feb 25, 2022
@JackBoosY
Copy link
Copy Markdown
Contributor

The two f2c.h have similarities and should be different versions.

@Neumann-A
Copy link
Copy Markdown
Contributor Author

The two f2c.h have similarities and should be different versions.

The problem is that the cspice header has custom modifications. So moving it into its own directory seems to be the correct solution.

@JackBoosY
Copy link
Copy Markdown
Contributor

Ping @BillyONeal for merge this PR if the tests passed.

@BillyONeal BillyONeal merged commit 6750a28 into microsoft:master Feb 25, 2022
@BillyONeal
Copy link
Copy Markdown
Member

Thanks :D

@Neumann-A Neumann-A deleted the move_cspice_headers branch February 26, 2022 06:51
ekilmer added a commit to ekilmer/vcpkg that referenced this pull request Feb 27, 2022
* master: (57 commits)
  [vcpkg-tools] update cmake and git (windows only) (microsoft#22985)
  Update vcpkg tool to 2022-02-24. (microsoft#23162)
  [vcpkg baseline] Move cspice headers (microsoft#23272)
  Fixed inaccurate Chinese words (microsoft#23179)
  [vcpkg] Add fixed changelog generator. (microsoft#23255)
  [authentication.md] Add Jenkins section (microsoft#23226)
  [vcpkg] Meson osx sysroot (microsoft#21772)
  [pkgconf] enable search for system libs on linux (microsoft#23010)
  [yasm/yasm-tool] Incorporate yasm-tool into yasm (microsoft#23218)
  [lapack-reference] Update to 3.10 (microsoft#23228)
  [skia] Arm64 for skia on osx (microsoft#23222)
  [libfido2] Update to 1.10.0 (microsoft#23241)
  [Tracy] Fixing issue where version 0.7.8 was pulling the wrong version (microsoft#23061)
  [libgpiod] Add new port. (microsoft#23221)
  [drogon] Update to 1.7.5 (microsoft#23227)
  [tinyexif] Remove from fail list. (microsoft#23163)
  [vcpkg docs][ES] Sync with English readme (microsoft#19834) (microsoft#22618)
  [vcpkg baseline][libao] Disable dlfcn check under windows (microsoft#23235)
  [OpenCV] upgrade to v4.5.5 (microsoft#22801)
  [libcurl-simple-https] New port (microsoft#22917)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

category:port-bug The issue is with a library, which is something the port should already support

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[cspice] file conflict with clapack

4 participants