Skip to content
Snippets Groups Projects
Commit 1857e2d8 authored by Dmitri Naumov's avatar Dmitri Naumov
Browse files

Remove remaining OGS/CMake and OgsLib occurences.

parent 9b301dd2
No related branches found
No related tags found
No related merge requests found
......@@ -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!")
......
......@@ -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 \
......
......@@ -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
)
......
......@@ -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
......
......@@ -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}
......
......@@ -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
......
# 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
)
......@@ -53,7 +53,6 @@ TARGET_LINK_LIBRARIES(testrunner
MeshLib
MeshGeoToolsLib
NumLib
OgsLib
logog
${BOOST_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT}
......
......@@ -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}
)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment