From 1857e2d8796c2fe54a7ca23f208b1fd857c682ea Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Thu, 11 Sep 2014 14:17:04 +0200
Subject: [PATCH] Remove remaining OGS/CMake and OgsLib occurences.
---
CMakeLists.txt | 3 ---
Documentation/Doxyfile.in | 1 -
FileIO/CMakeLists.txt | 1 -
Gui/DataExplorer.cmake | 2 --
Gui/DataView/CMakeLists.txt | 1 -
Gui/VtkVis/CMakeLists.txt | 1 -
OGS/CMakeLists.txt | 24 ------------------------
Tests/CMakeLists.txt | 1 -
Utils/FileConverter/CMakeLists.txt | 3 ---
9 files changed, 37 deletions(-)
delete mode 100644 OGS/CMakeLists.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a5787b6f24..da9dc743397 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -148,9 +148,6 @@ ADD_SUBDIRECTORY( MeshLib )
ADD_SUBDIRECTORY( MeshGeoToolsLib )
ADD_SUBDIRECTORY( NumLib )
ADD_SUBDIRECTORY( ProcessLib )
-IF( OGS_BUILD_CLI )
- ADD_SUBDIRECTORY( OGS )
-ENDIF() # OGS_BUILD_CLI
IF( OGS_BUILD_TESTS AND NOT IS_SUBPROJECT )
IF(CMAKE_VERSION VERSION_LESS 2.8.11)
MESSAGE(FATAL_ERROR "CMAKE 2.8.11 or higher is required to build the tests!")
diff --git a/Documentation/Doxyfile.in b/Documentation/Doxyfile.in
index 37e885ffe03..8257ba0d0c6 100644
--- a/Documentation/Doxyfile.in
+++ b/Documentation/Doxyfile.in
@@ -756,7 +756,6 @@ INPUT = ${CMAKE_SOURCE_DIR}/Applications \
${CMAKE_SOURCE_DIR}/MathLib \
${CMAKE_SOURCE_DIR}/MeshLib \
${CMAKE_SOURCE_DIR}/NumLib \
- ${CMAKE_SOURCE_DIR}/OGS \
${CMAKE_SOURCE_DIR}/ProcessLib \
${CMAKE_SOURCE_DIR}/README.md \
${CMAKE_SOURCE_DIR}/SimpleTests \
diff --git a/FileIO/CMakeLists.txt b/FileIO/CMakeLists.txt
index 00b4bac1400..1c09aec5d5e 100644
--- a/FileIO/CMakeLists.txt
+++ b/FileIO/CMakeLists.txt
@@ -41,7 +41,6 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}/../GeoLib
${CMAKE_CURRENT_SOURCE_DIR}/../MathLib
${CMAKE_CURRENT_SOURCE_DIR}/../MeshLib
- ${CMAKE_CURRENT_SOURCE_DIR}/../OGS
${CMAKE_CURRENT_BINARY_DIR}/../BaseLib
)
diff --git a/Gui/DataExplorer.cmake b/Gui/DataExplorer.cmake
index 5a320ba6385..7b90a862478 100644
--- a/Gui/DataExplorer.cmake
+++ b/Gui/DataExplorer.cmake
@@ -37,7 +37,6 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}/../FileIO
${CMAKE_CURRENT_SOURCE_DIR}/../MeshLib
${CMAKE_CURRENT_SOURCE_DIR}/../MeshLibGEOTOOLS
- ${CMAKE_CURRENT_SOURCE_DIR}/../OGS
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/Base
${CMAKE_CURRENT_BINARY_DIR}/DataView
@@ -76,7 +75,6 @@ TARGET_LINK_LIBRARIES( ogs-gui
FileIO
MeshLib
#MSHGEOTOOLS
- OgsLib
QtBase
QtDataView
StratView
diff --git a/Gui/DataView/CMakeLists.txt b/Gui/DataView/CMakeLists.txt
index 9f46ecc382e..3e820c31f00 100644
--- a/Gui/DataView/CMakeLists.txt
+++ b/Gui/DataView/CMakeLists.txt
@@ -138,7 +138,6 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../../BaseLib
${CMAKE_CURRENT_SOURCE_DIR}/../../MathLib
${CMAKE_CURRENT_SOURCE_DIR}/../../GeoLib
- ${CMAKE_CURRENT_SOURCE_DIR}/../../OGS
${CMAKE_CURRENT_SOURCE_DIR}/../../MeshLib
${CMAKE_CURRENT_SOURCE_DIR}/../../FileIO
${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/Gui/VtkVis/CMakeLists.txt b/Gui/VtkVis/CMakeLists.txt
index 67f31ec12ce..df82604fe25 100644
--- a/Gui/VtkVis/CMakeLists.txt
+++ b/Gui/VtkVis/CMakeLists.txt
@@ -135,7 +135,6 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}/../../MathLib
${CMAKE_CURRENT_SOURCE_DIR}/../../FileIO
${CMAKE_CURRENT_SOURCE_DIR}/../../MeshLib
- ${CMAKE_CURRENT_SOURCE_DIR}/../../OGS
${CMAKE_CURRENT_SOURCE_DIR}/../Base
${CMAKE_CURRENT_SOURCE_DIR}/../DataView
${CMAKE_CURRENT_BINARY_DIR}/../DataView
diff --git a/OGS/CMakeLists.txt b/OGS/CMakeLists.txt
deleted file mode 100644
index 6f6e67c6028..00000000000
--- a/OGS/CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-# Source files
-GET_SOURCE_FILES(SOURCES_OGSLIB)
-SET ( SOURCES ${SOURCES_OGSLIB})
-
-# Create the library
-ADD_LIBRARY(OgsLib STATIC ${SOURCES})
-
-include_directories(
- .
- ${CMAKE_CURRENT_SOURCE_DIR}/../BaseLib
- ${CMAKE_CURRENT_SOURCE_DIR}/../GeoLib
- ${CMAKE_CURRENT_SOURCE_DIR}/../MathLib
- ${CMAKE_CURRENT_SOURCE_DIR}/../MeshLib
-)
-
-
-target_link_libraries (OgsLib
- AssemblerLib
- BaseLib
- FileIO
- GeoLib
- MeshLib
-)
-
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 72069e17af2..7c15e9837b3 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -53,7 +53,6 @@ TARGET_LINK_LIBRARIES(testrunner
MeshLib
MeshGeoToolsLib
NumLib
- OgsLib
logog
${BOOST_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT}
diff --git a/Utils/FileConverter/CMakeLists.txt b/Utils/FileConverter/CMakeLists.txt
index a40352dec98..e45789b910a 100644
--- a/Utils/FileConverter/CMakeLists.txt
+++ b/Utils/FileConverter/CMakeLists.txt
@@ -17,7 +17,6 @@ IF (QT4_FOUND)
FileIO
GeoLib
BaseLib
- OgsLib
shp
${QT_LIBRARIES}
)
@@ -29,7 +28,6 @@ IF (QT4_FOUND)
ApplicationsLib
FileIO
GeoLib
- OgsLib
${QT_LIBRARIES}
)
@@ -38,7 +36,6 @@ IF (QT4_FOUND)
ApplicationsLib
FileIO
GeoLib
- OgsLib
${QT_LIBRARIES}
)
--
GitLab