Update cmake setup (#6)

* run conda on pr/push * remove pybind11 submodule * Link gfortran only for Linux builds. Not required for macos --------- Co-authored-by: Alex Soklev <[email protected]>
earth-system-radiation · Mar 18, 2024 · 02bc961 · 02bc961
1 parent e6ed1d6
commit 02bc961
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
@@ -5,6 +5,11 @@ on:
   pull_request:
     branches:
       - main
+      - master
+  push:
+    branches:
+      - main
+      - master
 
 jobs:
   build:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,6 +4,11 @@ project(rte-rrtmgp)
 # Add a custom target that always runs
 add_custom_target(compile-rte-rrtmgp ALL)
 
+set(LINUX FALSE)
+if (UNIX AND NOT APPLE)
+    set(LINUX TRUE)
+endif()
+
 # Custom command for the compile-rte-rrtmgp target
 add_custom_command(
     TARGET compile-rte-rrtmgp
@@ -40,10 +45,13 @@ target_link_directories(${TARGET_NAME} PUBLIC
 )
 
 target_link_libraries(${TARGET_NAME} PUBLIC 
-    gfortran
     rrtmgp
     rte
 )
 
+if ($LINUX)
+    target_link_libraries(${TARGET_NAME} PUBLIC gfortran)
+endif()
+
 # The install directory is the output (wheel) directory
 install(TARGETS pyrte DESTINATION pyrte)
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,11 @@ on: @@
       pull_request:
         branches:
           - main
+          - master
+      push:
+        branches:
+          - main
+          - master
     jobs:
       build:
@@ Expand Down @@