From c2224b3c1a85ec9f35cca1f6ddfec3d4bdf6465c Mon Sep 17 00:00:00 2001 From: Caleb Date: Mon, 13 Nov 2023 17:05:10 -0500 Subject: [PATCH] Refactoring build config --- .github/workflows/build-and-test.yml | 2 +- SRC_engines/src/solver/CMakeLists.txt | 4 ++-- SRC_engines/src/solver/version.h | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 4fe883a..4658cb0 100644 --- 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 index 4ab697e..5e05922 100644 --- a/SRC_engines/src/solver/CMakeLists.txt +++ b/SRC_engines/src/solver/CMakeLists.txt @@ -61,7 +61,7 @@ target_link_options(epanet2 ">" ) -target_link_libraries(swmm5 +target_link_libraries(epanet2 PUBLIC $<$>>:m> ) @@ -69,7 +69,7 @@ target_link_libraries(swmm5 target_include_directories(epanet2 PUBLIC - $ + $ $ ) diff --git a/SRC_engines/src/solver/version.h b/SRC_engines/src/solver/version.h index 5bcb81e..d816303 100644 --- 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() { \