👷 Add macos-latest build to CI

arthurlm · Nov 29, 2023 · 985127f · 985127f
1 parent 1f1f2fa
commit 985127f
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
     steps:
     - uses: actions/checkout@v4
       with:

diff --git a/quickfix-ffi/build.rs b/quickfix-ffi/build.rs
@@ -21,6 +21,7 @@ fn read_cmake_opt(flag: &str) -> &'static str {
 
 fn main() {
     let out_dir = env::var("OUT_DIR").expect("Missing OUT_DIR");
+    let target_os = TargetOs::from_env();
 
     // Make sure sub-repositories are correctly init
     update_sub_repositories();
@@ -74,9 +75,7 @@ fn main() {
         quickfix_bind_dst.display()
     );
 
-    if matches!(env::var("PROFILE").as_deref(), Ok("debug"))
-        && matches!(env::var("CARGO_CFG_TARGET_OS").as_deref(), Ok("windows"))
-    {
+    if matches!(env::var("PROFILE").as_deref(), Ok("debug")) && target_os == TargetOs::Windows {
         // libquickfix as a different name on windows with debug profile.
         println!("cargo:rustc-link-lib=static=quickfixd");
     } else {
@@ -86,8 +85,8 @@ fn main() {
     println!("cargo:rustc-link-lib=static=quickfixbind");
 
     // Lib std C++ is only available on UNIX platform.
-    if env::var("CARGO_CFG_UNIX").is_ok() {
-        println!("cargo:rustc-link-lib=stdc++");
+    if let Some(lib_cpp_name) = target_os.lib_std_cpp_name() {
+        println!("cargo:rustc-link-lib={lib_cpp_name}");
     }
 
     // Link with external libraries if needed.
@@ -114,3 +113,28 @@ fn update_sub_repositories() {
         panic!("Fail to update sub repo");
     }
 }
+
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+enum TargetOs {
+    Windows,
+    Linux,
+    Other,
+}
+
+impl TargetOs {
+    fn from_env() -> Self {
+        match env::var("CARGO_CFG_TARGET_OS").as_deref() {
+            Ok("windows") => Self::Windows,
+            Ok("linux") => Self::Linux,
+            _ => Self::Other,
+        }
+    }
+
+    fn lib_std_cpp_name(&self) -> Option<&'static str> {
+        match self {
+            Self::Windows => None,
+            Self::Linux => Some("stdc++"),
+            Self::Other => Some("c++"),
+        }
+    }
+}