Merge pull request #199 from simonrw/fix/198/msys2-pkg-config-cfitsio

Do not specify version of cfitsio on windows

CHANGELOG.md

@@ -7,6 +7,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 ## [Unreleased]
 ### Added
 ### Changed
+
+* `fitsio-sys`: do not specify the version for msys2 since it is not well represented
+
 ### Removed
 
 ## [0.21.0]

fitsio-sys-bindgen/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "fitsio-sys-bindgen"
 edition = "2018"
-version = "0.0.5"
+version = "0.0.6"
 authors = ["Simon Walker <[email protected]>"]
 description = "FFI wrapper around cfitsio"
 homepage = "https://github.com/simonrw/rust-fitsio"

fitsio-sys-bindgen/build.rs

@@ -5,7 +5,14 @@ use std::io::Write;
 use std::path::PathBuf;
 
 fn main() {
-    let package_name = "cfitsio >= 3.37";
+    // `msys2` does not report the version of cfitsio correctly, so ignore the version specifier for now.
+    let package_name = if cfg!(windows) {
+        let msg = "No version specifier available for pkg-config on windows, so the version of cfitsio used when compiling this program is unspecified";
+        println!("cargo:warning={msg}");
+        "cfitsio"
+    } else {
+        "cfitsio >= 3.37"
+    };
     let mut config = pkg_config::Config::new();
     config.print_system_libs(true);
     config.print_system_cflags(true);

fitsio-sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fitsio-sys"
-version = "0.5.0"
+version = "0.5.1"
 edition = "2018"
 authors = ["Simon Walker <[email protected]>"]
 description = "FFI wrapper around cfitsio"

fitsio-sys/build.rs

@@ -3,7 +3,14 @@ fn bind_cfitsio() {
     use pkg_config::Error;
     use std::io::Write;
 
-    let package_name = "cfitsio >= 3.37";
+    // `msys2` does not report the version of cfitsio correctly, so ignore the version specifier for now.
+    let package_name = if cfg!(windows) {
+        let msg = "No version specifier available for pkg-config on windows, so the version of cfitsio used when compiling this program is unspecified";
+        println!("cargo:warning={msg}");
+        "cfitsio"
+    } else {
+        "cfitsio >= 3.37"
+    };
     let mut config = pkg_config::Config::new();
     config.print_system_libs(true);
     config.print_system_cflags(true);