Merge pull request #62 from USEPA/triplet_build

Triplet build
USEPA · Nov 14, 2023 · 9f1da79 · 9f1da79
2 parents 2b3c2e9 + c2224b3
commit 9f1da79
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 24 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -3,7 +3,7 @@
 name: Build and Test EPANET 2.2
 on:
   push:
-    branches: [ master ]
+    branches: [ master, triplet_build ]
   pull_request:
     branches: [ master ]
 

diff --git a/SRC_engines/CMakeLists.txt b/SRC_engines/CMakeLists.txt
@@ -1,3 +1,14 @@
+#
+# CMakeLists.txt - CMake configuration file for EPANET
+#
+# Created: Nov 13, 2023
+# Modified: Nov 13, 2023
+#
+# Author: Caleb Buahin
+#         US EPA ORD/CESER
+#
+
+
 cmake_minimum_required(VERSION 3.9)
 
 if("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")

diff --git a/SRC_engines/src/run/CMakeLists.txt b/SRC_engines/src/run/CMakeLists.txt
@@ -1,3 +1,13 @@
+#
+# CMakeLists.txt - CMake configuration file for EPANET Runner
+#
+# Created: Nov 13, 2023
+# Modified: Nov 13, 2023
+#
+# Author: Caleb Buahin
+#         US EPA ORD/CESER
+#
+
 if(APPLE)
     set(RPATH_ROOT "@loader_path")
 else()
@@ -37,9 +47,3 @@ install(TARGETS runepanet
 )
 
 
-# # copy runswmm to build tree for testing
-# add_custom_command(TARGET runepanet POST_BUILD
-#     COMMAND ${CMAKE_COMMAND} -E copy
-#         $<TARGET_FILE:runepanet>
-#         ${CMAKE_BINARY_DIR}/bin/$<CONFIGURATION>/$<TARGET_FILE_NAME:runepanet>
-# )
diff --git a/SRC_engines/src/solver/CMakeLists.txt b/SRC_engines/src/solver/CMakeLists.txt
@@ -1,8 +1,20 @@
+#
+# CMakeLists.txt - CMake configuration file for EPANET solver
+#
+# Created: Nov 13, 2023
+# Modified: Nov 13, 2023
+#
+# Author: Caleb Buahin
+#         US EPA ORD/CESER
+#
+
+
 include(../../extern/version.cmake)
 
 set(EPANET_PUBLIC_HEADERS
-    ${PROJECT_SOURCE_DIR}/include/epanet2_2.h
     ${PROJECT_SOURCE_DIR}/include/epanet2.h
+    ${PROJECT_SOURCE_DIR}/include/epanet2_2.h
+    ${PROJECT_SOURCE_DIR}/include/epanet2_enums.h
 )
 
 file(GLOB
@@ -49,23 +61,16 @@ target_link_options(epanet2
         ">"
 )
 
-if(UNIX)
-    target_link_libraries(epanet2
-        PRIVATE
-            m
-    )
-endif()
+target_link_libraries(epanet2
+    PUBLIC
+        $<$<NOT:$<BOOL:$<C_COMPILER_ID:MSVC>>>:m>
+)
+
 
 target_include_directories(epanet2
     PUBLIC
-        $<INSTALL_INTERFACE:${INCLUDE_DIST}>
-    PRIVATE
         $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
-)
-
-include(GenerateExportHeader)
-generate_export_header(epanet2
-    STATIC_DEFINE SHARED_EXPORTS_BUILT_AS_STATIC
+        $<INSTALL_INTERFACE:${INCLUDE_DIST}>
 )
 
 if(APPLE)

diff --git a/SRC_engines/src/solver/version.h b/SRC_engines/src/solver/version.h
@@ -22,12 +22,12 @@
 #define VERSION_MAJOR       2
 #define VERSION_MINOR       2
 #define VERSION_PATCH       0
-#define GIT_HASH            "31eb962b1f7c65ac739899105d27617c2a94b7f3"
+#define GIT_HASH            "5480e100e626b479a866da4bdd867f69400b4e31"
 
 #define PLATFORM            "Windows"
 #define COMPILER            "MSVC"
-#define COMPILER_VERSION    "19.37.32824.0"
-#define BUILD_ID            "2023-10-23T18:30:13Z"
+#define COMPILER_VERSION    "19.37.32825.0"
+#define BUILD_ID            "2023-11-13T22:04:14Z"
 
 
 static inline int get_version_legacy() { \