Merge branch 'norihiro-w-move-FemLib-to-OGS'

CMakeLists.txt

@@ -109,7 +109,6 @@ ADD_SUBDIRECTORY( AssemblerLib )
 ADD_SUBDIRECTORY( BaseLib )
 # TODO This is a hack but we have to make sure that Boost is built first
 ADD_DEPENDENCIES(BaseLib Boost)
-ADD_SUBDIRECTORY( FemLib )
 ADD_SUBDIRECTORY( FileIO )
 ADD_SUBDIRECTORY( GeoLib )
 ADD_SUBDIRECTORY( MathLib )

FemLib/CMakeLists.txt

-# Source files
-GET_SOURCE_FILES(SOURCES_FEMLIB)
-SET ( SOURCES ${SOURCES_FEMLIB})
-
-# Create the library
-ADD_LIBRARY(FemLib STATIC ${SOURCES})
-
-include_directories(
-	.
-	../BaseLib
-	../GeoLib
-	../MathLib
-)
-
-
-target_link_libraries (FemLib
-	BaseLib
-	GeoLib
-	MathLib
-)
-

FileIO/CMakeLists.txt

@@ -34,7 +34,6 @@ ADD_LIBRARY(FileIO STATIC ${SOURCES})
 INCLUDE_DIRECTORIES(
 	.
 	${CMAKE_CURRENT_SOURCE_DIR}/../BaseLib
-	${CMAKE_CURRENT_SOURCE_DIR}/../FemLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../GeoLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../MathLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../MeshLib

Gui/DataExplorer.cmake

@@ -39,7 +39,6 @@ INCLUDE_DIRECTORIES(
 	${CMAKE_CURRENT_SOURCE_DIR}/../FileIO
 	${CMAKE_CURRENT_SOURCE_DIR}/../MeshLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../MeshLibGEOTOOLS
-	${CMAKE_CURRENT_SOURCE_DIR}/../FemLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../OGS
 	${CMAKE_CURRENT_BINARY_DIR}
 	${CMAKE_CURRENT_BINARY_DIR}/Base
@@ -82,7 +81,6 @@ TARGET_LINK_LIBRARIES( ogs-gui
 	FileIO
 	MeshLib
 	#MSHGEOTOOLS
-	FemLib
 	OgsLib
 	QtBase
 	QtDataView

Gui/DataView/CMakeLists.txt

@@ -145,7 +145,6 @@ include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}/../../GeoLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../../OGS
 	${CMAKE_CURRENT_SOURCE_DIR}/../../MeshLib
-	${CMAKE_CURRENT_SOURCE_DIR}/../../FemLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../../FileIO
 	${CMAKE_CURRENT_SOURCE_DIR}
 	${CMAKE_CURRENT_SOURCE_DIR}/DiagramView
@@ -184,7 +183,6 @@ add_library( QtDataView STATIC
 # Link Qt library
 target_link_libraries( QtDataView
 	${QT_LIBRARIES}
-	FemLib
 	FileIO
 	GeoLib
 	MeshLib

Gui/VtkAct/CMakeLists.txt

@@ -33,7 +33,6 @@ include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}
 	${CMAKE_CURRENT_BINARY_DIR}
 	${CMAKE_CURRENT_SOURCE_DIR}/../../BaseLib
-	${CMAKE_CURRENT_SOURCE_DIR}/../../FemLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../../GeoLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../../FileIO
 	${CMAKE_CURRENT_SOURCE_DIR}/../../FileIO/MeshIO

Gui/VtkVis/CMakeLists.txt

@@ -135,7 +135,6 @@ INCLUDE_DIRECTORIES(
 	${CMAKE_CURRENT_BINARY_DIR}
 	${CMAKE_CURRENT_SOURCE_DIR}/../../BaseLib
 	${CMAKE_CURRENT_BINARY_DIR}/../../BaseLib
-	${CMAKE_CURRENT_SOURCE_DIR}/../../FemLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../../GeoLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../../MathLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../../FileIO

OGS/CMakeLists.txt

@@ -8,7 +8,6 @@ ADD_LIBRARY(OgsLib STATIC ${SOURCES})
 include_directories(
 	.
 	${CMAKE_CURRENT_SOURCE_DIR}/../BaseLib
-	${CMAKE_CURRENT_SOURCE_DIR}/../FemLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../GeoLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../MathLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../MeshLib
@@ -17,7 +16,6 @@ include_directories(
 
 target_link_libraries (OgsLib
 	BaseLib
-	FemLib
 	GeoLib
 	MeshLib
 )