From dd5d3d2e36c8f023d183ad568d3e3fa6fc0e3bff Mon Sep 17 00:00:00 2001 From: Sam Hatchett Date: Tue, 15 Dec 2015 16:39:47 -0500 Subject: [PATCH] adds cmake build for ENBOF --- build/CMake/CMakeLists.txt | 4 ++++ build/Xcode/epanet.xcodeproj/project.pbxproj | 12 ++++++++++++ 2 files changed, 16 insertions(+) diff --git a/build/CMake/CMakeLists.txt b/build/CMake/CMakeLists.txt index bac6e0d..caa4fa2 100644 --- a/build/CMake/CMakeLists.txt +++ b/build/CMake/CMakeLists.txt @@ -17,3 +17,7 @@ add_library(epanet STATIC ${EPANET_SOURCES}) include_directories(../../src) add_executable(runepanet ../../run/main.c) target_link_libraries (runepanet LINK_PUBLIC epanet m) + +# the binary hydraulics file API +include_directories(../../tools/outputapi) +add_library(epanet_bin_out STATIC ../../tools/outputapi/outputapi.c) diff --git a/build/Xcode/epanet.xcodeproj/project.pbxproj b/build/Xcode/epanet.xcodeproj/project.pbxproj index 02864fd..d7fb082 100755 --- a/build/Xcode/epanet.xcodeproj/project.pbxproj +++ b/build/Xcode/epanet.xcodeproj/project.pbxproj @@ -134,6 +134,8 @@ 22322FA9106836B000641384 /* epanet2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 2; name = epanet2.h; path = ../../include/epanet2.h; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 2255753B17551217009946B1 /* libepanet-static.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libepanet-static.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 22CD9A5D1B27898E00B65E83 /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = main.c; path = ../../run/main.c; sourceTree = ""; }; + 22E107B21C163E5300689CED /* outputapi.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = outputapi.c; path = ../../tools/outputapi/outputapi.c; sourceTree = ""; }; + 22E107B31C163E5300689CED /* outputapi.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = outputapi.h; path = ../../tools/outputapi/outputapi.h; sourceTree = ""; }; D2AAC0630554660B00DB518D /* libepanet.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libepanet.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -181,6 +183,7 @@ 08FB7794FE84155DC02AAC07 /* epanet */ = { isa = PBXGroup; children = ( + 22E107B11C163E3B00689CED /* Output API */, 223109E21BA865790030AAE8 /* sample networks */, 22CD9A5C1B27896200B65E83 /* run epanet */, 22322FA8106836A000641384 /* Include */, @@ -255,6 +258,15 @@ name = "run epanet"; sourceTree = ""; }; + 22E107B11C163E3B00689CED /* Output API */ = { + isa = PBXGroup; + children = ( + 22E107B31C163E5300689CED /* outputapi.h */, + 22E107B21C163E5300689CED /* outputapi.c */, + ); + name = "Output API"; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */