Fixed cmake include directories

USEPA · Sep 12, 2023 · d9eae81 · d9eae81
1 parent 1dd87ec
commit d9eae81
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -1,6 +1,6 @@
 # This starter workflow is for a CMake project running on multiple platforms. There is a different starter workflow if you just want a single platform.
 # See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-single-platform.yml
-name: Build and Test MSX
+name: Build and Test EPANET 2.2
 on:
   push:
     branches: [ master, triplet_build ]

diff --git a/SRC_engines/src/run/CMakeLists.txt b/SRC_engines/src/run/CMakeLists.txt
@@ -14,7 +14,7 @@ add_executable(runepanet
 
 target_include_directories(runepanet
     PUBLIC
-        ../../include
+        ${PROJECT_SOURCE_DIR}/include
 )
 
 target_link_libraries(runepanet

diff --git a/SRC_engines/src/solver/CMakeLists.txt b/SRC_engines/src/solver/CMakeLists.txt
@@ -1,8 +1,8 @@
 include(../../extern/version.cmake)
 
 set(EPANET_PUBLIC_HEADERS
-    ${PROJECT_SOURCE_DIR}/include/epanet2.h
     ${PROJECT_SOURCE_DIR}/include/epanet2_2.h
+    ${PROJECT_SOURCE_DIR}/include/epanet2.h
 )
 
 file(GLOB
@@ -60,7 +60,7 @@ target_include_directories(epanet2
     PUBLIC
         $<INSTALL_INTERFACE:${INCLUDE_DIST}>
     PRIVATE
-        $<BUILD_INTERFACE:{PROJECT_SOURCE_DIR}/include
+        $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
 )
 
 include(GenerateExportHeader)

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            "02473a040844ffa4f92c0b8599f6bc48331f7654"
+#define GIT_HASH            "1dd87ecdf7ea48729610355f7d087da064112ca5"
 
 #define PLATFORM            "Windows"
 #define COMPILER            "MSVC"
 #define COMPILER_VERSION    "19.37.32822.0"
-#define BUILD_ID            "2023-09-12T18:01:41Z"
+#define BUILD_ID            "2023-09-12T18:19:20Z"
 
 
 static inline int get_version_legacy() { \