cmp - add masonry to CMake.

zhuminjie · Aug 23, 2021 · 165c285 · 165c285
1 parent 76db0ef
commit 165c285
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/Conf.cmake b/Conf.cmake
@@ -107,6 +107,7 @@ set(OPS_Element_List
     OPS_Element_shell
     OPS_Element_surfaceLoad
     OPS_Element_updatedLagrangianBeamColumn
+    OPS_Element_masonry
     #OPS_Element_feap
     #OPS_Element_PFEMElement
 )

diff --git a/SRC/element/CMakeLists.txt b/SRC/element/CMakeLists.txt
@@ -70,6 +70,7 @@ add_subdirectory(UP-ucsd)
 add_subdirectory(UWelements)
 add_subdirectory(HUelements)
 add_subdirectory(XMUelements)
+add_subdirectory(masonry)
 #add_subdirectory(dmglib)
 
 target_include_directories(OPS_Element PUBLIC ${CMAKE_CURRENT_LIST_DIR})

diff --git a/SRC/element/TclElementCommands.cpp b/SRC/element/TclElementCommands.cpp
@@ -590,7 +590,6 @@ TclModelBuilderElementCommand(ClientData clientData, Tcl_Interp *interp,
     }
 #endif
 
-#if defined(_OPS_ELEMENT_WHEELRAIL)
   // Beginning of WheelRail element TCL command
   //Added by Quan Gu and Yongdou Liu, et al. on 2018/10/31
 
@@ -600,8 +599,8 @@ TclModelBuilderElementCommand(ClientData clientData, Tcl_Interp *interp,
     int result = TclModelBuilder_addWheelRail(clientData, interp, argc, argv,
 					      theTclDomain, theTclBuilder, eleArgStart);
     return result;
+
   // End of WheelRail element TCL command
-#endif
 
   } else if ((strcmp(argv[1],"ElasticTimoshenkoBeam") == 0) || (strcmp(argv[1],"elasticTimoshenkoBeam")) == 0) {
     Element *theEle = 0;

diff --git a/SRC/material/uniaxial/CMakeLists.txt b/SRC/material/uniaxial/CMakeLists.txt
@@ -157,12 +157,15 @@ target_sources(OPS_Material
       TDConcreteMC10.cpp
       TDConcreteMC10NL.cpp
       TensionOnlyMaterial.cpp
-      TriMatrix.cpp
       UniaxialJ2Plasticity.cpp
       ViscousDamper.cpp
       ViscousMaterial.cpp
       WrapperUniaxialMaterial.cpp
       pyUCLA.cpp
+      SMAMaterial.cpp
+
+      TriMatrix.cpp
+
     PUBLIC
       ASD_SMA_3K.h
       BackboneMaterial.h
@@ -258,14 +261,16 @@ target_sources(OPS_Material
       TDConcreteMC10.h
       TDConcreteMC10NL.h
       TensionOnlyMaterial.h
-      TriMatrix.h
       UniaxialJ2Plasticity.h
       ViscousDamper.h
       ViscousMaterial.h
       WrapperUniaxialMaterial.h
       pyUCLA.h
+
+      TriMatrix.h  # move to SRC/matrix ?
 )
 
+
 add_library(OPS_Material_f)
 
 target_sources(OPS_Material_f PUBLIC