Skip to content

Commit

Permalink
cmp - add more missing CMakeLists in material/uniaxial
Browse files Browse the repository at this point in the history
  • Loading branch information
claudioperez committed Jun 25, 2021
1 parent d4f4d3b commit 294aa80
Show file tree
Hide file tree
Showing 7 changed files with 89 additions and 21 deletions.
5 changes: 3 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,8 @@ target_link_libraries(G3
G3_SysOfEqn
G3_Tagged
G3_Utilities
graph
graph
coordTransformation
OPS_ConvergenceTest
G3_Numerics
)
Expand Down Expand Up @@ -308,7 +309,7 @@ opensees_add_cxx_flag(TARGETS OPS_Tcl
# OpenSeesTcl
#----------------------------
target_link_libraries(OpenSeesTcl
PRIVATE OPS_Tcl OpenSees ${OPS_Element_List} ${CMAKE_DL_LIBS}
PRIVATE OPS_Tcl OpenSees ${OPS_Element_List} ${CMAKE_DL_LIBS}
)

#----------------------------
Expand Down
6 changes: 3 additions & 3 deletions Conf.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -116,20 +116,20 @@ set(OPS_Element_List
OPS_Element_absorbentBoundaries
OPS_Element_adapter
OPS_Element_beam3d
OPS_Element_beamWithHinges
#OPS_Element_beamWithHinges
OPS_Element_catenaryCable
OPS_Element_componentElement
OPS_Element_dispBeamColumnInt
OPS_Element_elastomericBearing
OPS_Element_feap
#OPS_Element_feap
OPS_Element_frictionBearing
OPS_Element_generic
OPS_Element_gradientInelasticBeamColumn
OPS_Element_joint
OPS_Element_LHMYS
OPS_Element_mixedBeamColumn
OPS_Element_mvlem
OPS_Element_PFEMElement
#OPS_Element_PFEMElement
OPS_Element_PML
OPS_Element_pyMacro
OPS_Element_RockingBC
Expand Down
28 changes: 24 additions & 4 deletions SRC/material/uniaxial/backbone/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,31 @@

target_sources(OPS_Material
PRIVATE

ArctangentBackbone.cpp
CappedBackbone.cpp
HystereticBackbone.cpp
LinearCappedBackbone.cpp
ManderBackbone.cpp
MaterialBackbone.cpp
MultilinearBackbone.cpp
RaynorBackbone.cpp
ReeseSandBackbone.cpp
ReeseSoftClayBackbone.cpp
ReeseStiffClayBelowWS.cpp
TrilinearBackbone.cpp
PUBLIC

ArctangentBackbone.h
CappedBackbone.h
HystereticBackbone.h
LinearCappedBackbone.h
ManderBackbone.h
MaterialBackbone.h
MultilinearBackbone.h
RaynorBackbone.h
ReeseSandBackbone.h
ReeseSoftClayBackbone.h
ReeseStiffClayBelowWS.h
TrilinearBackbone.h
)

target_include_directories(OPS_Material PUBLIC $(CMAKE_CURRENT_LIST_DIR))


29 changes: 25 additions & 4 deletions SRC/material/uniaxial/fedeas/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,32 @@

target_sources(OPS_Material
PRIVATE

FedeasBond1Material.cpp
FedeasBond2Material.cpp
FedeasConcr1Material.cpp
FedeasConcr2Material.cpp
FedeasConcr3Material.cpp
FedeasHardeningMaterial.cpp
FedeasHyster1Material.cpp
FedeasHyster2Material.cpp
FedeasSteel1Material.cpp
FedeasSteel2Material.cpp
Hard1.f
PD1.c
PD1.f
PlasticDamageMaterial.cpp
PUBLIC

FedeasBond1Material.h
FedeasBond2Material.h
FedeasConcr1Material.h
FedeasConcr2Material.h
FedeasConcr3Material.h
FedeasHardeningMaterial.h
FedeasHyster1Material.h
FedeasHyster2Material.h
FedeasSteel1Material.h
FedeasSteel2Material.h
PlasticDamageMaterial.h
)

target_include_directories(OPS_Material PUBLIC $(CMAKE_CURRENT_LIST_DIR))


9 changes: 5 additions & 4 deletions SRC/material/uniaxial/limitState/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@

target_sources(OPS_Material
PRIVATE

LimitStateMaterial.cpp
PinchingLimitStateMaterial.cpp
PUBLIC

LimitStateMaterial.h
PinchingLimitStateMaterial.h
)

target_include_directories(OPS_Material PUBLIC $(CMAKE_CURRENT_LIST_DIR))


add_subdirectory(./limitCurve/)
19 changes: 19 additions & 0 deletions SRC/material/uniaxial/limitState/limitCurve/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@

target_sources(OPS_Material
PRIVATE
AxialCurve.cpp
LimitCurve.cpp
RotationShearCurve.cpp
ShearCurve.cpp
ThreePointCurve.cpp
WrapperLimitCurve.cpp
PUBLIC
AxialCurve.h
LimitCurve.h
RotationShearCurve.h
ShearCurve.h
ThreePointCurve.h
WrapperLimitCurve.h
)
target_include_directories(OPS_Material PUBLIC $(CMAKE_CURRENT_LIST_DIR))

14 changes: 10 additions & 4 deletions SRC/material/uniaxial/stiffness/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@

target_sources(OPS_Material
PRIVATE

ConstantStiffnessDegradation.cpp
DuctilityStiffnessDegradation.cpp
EnergyStiffnessDegradation.cpp
PincheiraStiffnessDegradation.cpp
StiffnessDegradation.cpp
PUBLIC

ConstantStiffnessDegradation.h
DuctilityStiffnessDegradation.h
EnergyStiffnessDegradation.h
PincheiraStiffnessDegradation.h
StiffnessDegradation.h
)

target_include_directories(OPS_Material PUBLIC $(CMAKE_CURRENT_LIST_DIR))


0 comments on commit 294aa80

Please sign in to comment.