Refactoring build config

USEPA · Nov 13, 2023 · c2224b3 · c2224b3
1 parent 5480e10
commit c2224b3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 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/src/solver/CMakeLists.txt b/SRC_engines/src/solver/CMakeLists.txt
@@ -61,15 +61,15 @@ target_link_options(epanet2
         ">"
 )
 
-target_link_libraries(swmm5
+target_link_libraries(epanet2
     PUBLIC
         $<$<NOT:$<BOOL:$<C_COMPILER_ID:MSVC>>>:m>
 )
 
 
 target_include_directories(epanet2
     PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+        $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
         $<INSTALL_INTERFACE:${INCLUDE_DIST}>
 )
 

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() { \