From d81541de80fd765dfa7c20b2854f9bfe68bf1f6c Mon Sep 17 00:00:00 2001
From: rinkk <karsten.rink@ufz.de>
Date: Mon, 15 Aug 2016 14:27:41 +0200
Subject: [PATCH] moved swmm interface files to file i/o
---
Applications/FileIO/CMakeLists.txt | 5 +++++
.../{Utils/SWMMConverter => FileIO/SWMM}/SWMMInterface.cpp | 0
.../{Utils/SWMMConverter => FileIO/SWMM}/SWMMInterface.h | 0
Applications/Utils/SWMMConverter/CMakeLists.txt | 6 +++---
Applications/Utils/SWMMConverter/SWMMConverter.cpp | 2 +-
ThirdParty/CMakeLists.txt | 1 -
6 files changed, 9 insertions(+), 5 deletions(-)
rename Applications/{Utils/SWMMConverter => FileIO/SWMM}/SWMMInterface.cpp (100%)
rename Applications/{Utils/SWMMConverter => FileIO/SWMM}/SWMMInterface.h (100%)
diff --git a/Applications/FileIO/CMakeLists.txt b/Applications/FileIO/CMakeLists.txt
index 5b9d973135f..e140aeb5fc0 100644
--- a/Applications/FileIO/CMakeLists.txt
+++ b/Applications/FileIO/CMakeLists.txt
@@ -11,6 +11,11 @@ if(QT4_FOUND)
APPEND_SOURCE_FILES(SOURCES FEFLOW)
endif()
+if(OGS_BUILD_SWMM)
+ GET_SOURCE_FILES(SOURCES_SWMM SWMM)
+ SET(SOURCES ${SOURCES} ${SOURCES_SWMM})
+endif()
+
include(${PROJECT_SOURCE_DIR}/scripts/cmake/OGSEnabledElements.cmake)
# Create the library
diff --git a/Applications/Utils/SWMMConverter/SWMMInterface.cpp b/Applications/FileIO/SWMM/SWMMInterface.cpp
similarity index 100%
rename from Applications/Utils/SWMMConverter/SWMMInterface.cpp
rename to Applications/FileIO/SWMM/SWMMInterface.cpp
diff --git a/Applications/Utils/SWMMConverter/SWMMInterface.h b/Applications/FileIO/SWMM/SWMMInterface.h
similarity index 100%
rename from Applications/Utils/SWMMConverter/SWMMInterface.h
rename to Applications/FileIO/SWMM/SWMMInterface.h
diff --git a/Applications/Utils/SWMMConverter/CMakeLists.txt b/Applications/Utils/SWMMConverter/CMakeLists.txt
index b37969bfd34..d9a14ae8ac0 100644
--- a/Applications/Utils/SWMMConverter/CMakeLists.txt
+++ b/Applications/Utils/SWMMConverter/CMakeLists.txt
@@ -1,16 +1,16 @@
add_executable(SWMMConverter
SWMMConverter.cpp
- SwmmInterface.h
- SwmmInterface.cpp
)
target_link_libraries(SWMMConverter
ApplicationsFileIO
GeoLib
MeshLib
- swmm5interface
+ SwmmInterface
)
+include_directories( ${CMAKE_SOURCE_DIR}/Applications/FileIO )
+
ADD_VTK_DEPENDENCY(SWMMConverter)
set_target_properties(SWMMConverter PROPERTIES FOLDER Utilities)
diff --git a/Applications/Utils/SWMMConverter/SWMMConverter.cpp b/Applications/Utils/SWMMConverter/SWMMConverter.cpp
index bac691abc3b..cb784c0120e 100644
--- a/Applications/Utils/SWMMConverter/SWMMConverter.cpp
+++ b/Applications/Utils/SWMMConverter/SWMMConverter.cpp
@@ -8,7 +8,7 @@
#include <tclap/CmdLine.h>
-#include "SWMMInterface.h"
+#include "Applications/FileIO/SWMM/SWMMInterface.h"
#include "ThirdParty/SWMMInterface/swmm5_iface.h"
#include "Applications/ApplicationsLib/LogogSetup.h"
diff --git a/ThirdParty/CMakeLists.txt b/ThirdParty/CMakeLists.txt
index 8f75c2e6a60..ef5bc7826ce 100644
--- a/ThirdParty/CMakeLists.txt
+++ b/ThirdParty/CMakeLists.txt
@@ -52,6 +52,5 @@ if(NOT TARGET vtkGUISupportQt AND OGS_BUILD_GUI)
endif()
if(OGS_BUILD_SWMM)
- add_subdirectory(${CMAKE_SOURCE_DIR}/ThirdParty/SWMMInterface/swmm5)
add_subdirectory(${CMAKE_SOURCE_DIR}/ThirdParty/SWMMInterface)
endif()
--
GitLab