From ba12bba46073ba2e771b49d0b8f5b872e61f1455 Mon Sep 17 00:00:00 2001
From: Sean Bryan <sean.bryan@anu.edu.au>
Date: Thu, 18 Jan 2024 14:10:45 +1100
Subject: [PATCH] Suggestions from Micael

---
 CMakeLists.txt | 50 ++++++++++++++++++++++++--------------------------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 97422ba38c..bb56074e23 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ project(
 option(CABLE_MPI "Build the MPI executable" OFF)
 
 set(
-    srcs_common
+    CABLE_SRCS_COMMON
     src/science/casa-cnp/bgcdriver.F90
     src/science/casa-cnp/biogeochem_casa.F90
     src/offline/cable_abort.F90
@@ -123,36 +123,34 @@ find_package(PkgConfig REQUIRED)
 
 pkg_check_modules(NETCDF REQUIRED IMPORTED_TARGET "netcdf-fortran")
 
-if(NOT CABLE_MPI)
-    add_executable(
-        cable
-        src/offline/cable_driver.F90
-        ${srcs_common}
-    )
-
-    # third party libs
-    target_link_libraries(
-        cable
-        PkgConfig::NETCDF
-    )
-
-    install(TARGETS cable)
-else()
-    add_executable(
-        cable-mpi
+if(CABLE_MPI)
+    set(
+        CABLE_SRCS
         src/offline/cable_mpidrv.F90
         src/offline/cable_mpicommon.F90
         src/offline/cable_mpimaster.F90
         src/offline/cable_mpiworker.F90
         src/science/pop/pop_mpi.F90
-        ${srcs_common}
+        ${CABLE_SRCS_COMMON}
     )
-
-    # third party libs
-    target_link_libraries(
-        cable-mpi
-        PkgConfig::NETCDF
+    set(CABLE_EXE_NAME cable-mpi)
+else()
+    set(
+        CABLE_SRCS
+        src/offline/cable_driver.F90
+        ${CABLE_SRCS_COMMON}
     )
-
-    install(TARGETS cable-mpi)
+    set(CABLE_EXE_NAME cable)
 endif()
+
+add_executable(cable ${CABLE_SRCS})
+
+set_target_properties(cable PROPERTIES OUTPUT_NAME ${CABLE_EXE_NAME})
+
+# third party libs
+target_link_libraries(
+    cable
+    PkgConfig::NETCDF
+)
+
+install(TARGETS cable RUNTIME)