cmp - clean cmake files

zhuminjie · Sep 19, 2021 · 289594c · 289594c
1 parent e964a5c
commit 289594c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 23 deletions.
diff --git a/OTHER/CMakeLists.txt b/OTHER/CMakeLists.txt
@@ -18,6 +18,7 @@ set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
 
 add_subdirectory(AMD/)
 add_subdirectory(UMFPACK/)
+add_subdirectory(ITPACK/)
 add_subdirectory(ARPACK/)
 add_subdirectory(SuperLU_5.1.1/)
 add_subdirectory(CSPARSE/)

diff --git a/SRC/domain/CMakeLists.txt b/SRC/domain/CMakeLists.txt
@@ -1,13 +1,15 @@
-
-#add_library(domain OBJECT)
-
-#target_include_directories(domain PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+#==============================================================================
+# 
+#        OpenSees -- Open System For Earthquake Engineering Simulation
+#                Pacific Earthquake Engineering Research Center
+# 
+#==============================================================================
 
 add_subdirectory(component)
 add_subdirectory(domain)
-add_subdirectory(load)    
-add_subdirectory(node)    
-add_subdirectory(subdomain)    
+add_subdirectory(load)
+add_subdirectory(node)
+add_subdirectory(subdomain)
 add_subdirectory(constraints)
 add_subdirectory(pattern)
 add_subdirectory(groundMotion)

diff --git a/SRC/element/HUelements/CMakeLists.txt b/SRC/element/HUelements/CMakeLists.txt
@@ -1,17 +1,15 @@
 
 target_sources(OPS_Element
-    PRIVATE
+  PRIVATE
     MultipleShearSpring.cpp
     MultipleNormalSpring.cpp
     DBESI0.c
     DBESI1.c
     YamamotoBiaxialHDR.cpp
     KikuchiBearing.cpp
-    PUBLIC
+  PUBLIC
     MultipleShearSpring.h
     MultipleNormalSpring.h
-    #DBESI0.h
-    #DBESI1.h
     YamamotoBiaxialHDR.h
     KikuchiBearing.h
 )

diff --git a/SRC/element/TclElementCommands.cpp b/SRC/element/TclElementCommands.cpp
@@ -148,11 +148,9 @@ extern void* OPS_MVLEM_3D(void);    // Kristijan Kolozvari
 extern void* OPS_SFI_MVLEM_3D(void);    // Kristijan Kolozvari
 extern void *OPS_AxEqDispBeamColumn2d(void);
 extern void *OPS_ElastomericBearingBoucWenMod3d(void);
-#if defined(OPSDEF_ELEMENT_PFEM)
 extern void *OPS_PFEMElement2DBubble(const ID &info);
 extern void *OPS_PFEMElement2Dmini(const ID &info);
 extern void *OPS_PFEMElement2D();
-#endif
 #if defined(_HAVE_LHNMYS) || defined(OPSDEF_ELEMENT_LHNMYS)
 extern void* OPS_BeamColumn2DwLHNMYS(void);
 extern void* OPS_BeamColumn2DwLHNMYS_Damage(void);
@@ -195,10 +193,8 @@ extern void *OPS_BeamGT(void);
 extern void* OPS_DispBeamColumnAsym3dTcl();  //Xinlong Du
 extern void* OPS_MixedBeamColumnAsym3dTcl(); //Xinlong Du
 
-#if defined(OPSDEF_Element_FEAP)
 extern int TclModelBuilder_addFeapTruss(ClientData clientData, Tcl_Interp *interp,  int argc,
 					TCL_Char **argv, Domain*, TclModelBuilder *, int argStart);
-#endif // _OPS_Element_FEAP
 
 extern int
 Tcl_addWrapperElement(eleObj *, ClientData clientData, Tcl_Interp *interp,  int argc,

diff --git a/SRC/element/beam3d/CMakeLists.txt b/SRC/element/beam3d/CMakeLists.txt
@@ -1,12 +1,10 @@
-add_library(OPS_Element_beam3d OBJECT)
 
-target_sources(OPS_Element_beam3d
-    PRIVATE
-        beam3d01.cpp
-        beam3d02.cpp
-    PUBLIC
-        beam3d01.h
-        beam3d02.h
+opensees_elements(OPS_Element_beam3d
+  SOURCES
+     beam3d01.cpp
+     beam3d02.cpp
+     beam3d01.h
+     beam3d02.h
 )
 
 target_include_directories(OPS_Element_beam3d PUBLIC ${CMAKE_CURRENT_LIST_DIR})