Skip to content

Commit

Permalink
ss
Browse files Browse the repository at this point in the history
  • Loading branch information
claudioperez committed Aug 23, 2021
1 parent a45d3ab commit d1cfc1e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 23 deletions.
16 changes: 0 additions & 16 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -499,13 +499,11 @@ endif()
message("OPS >>> Configuring OpenSees extensions")
foreach(extension IN LISTS OPS_Element_List OPS_Extension_List)
string(TOUPPER "${extension}" ext_flag)
#set(ext_flag "_${ext_flag}")
string(REGEX REPLACE "^OPS_" "OPSDEF_" ext_flag "${ext_flag}")
message(" Adding macro definition '${ext_flag}'")
add_compile_definitions(${ext_flag})
endforeach()

#----------------------------
# Renderer
#----------------------------
if (OPS_Use_Graphics)
Expand All @@ -515,28 +513,14 @@ else()
add_compile_definitions(_NOGRAPHICS)
endif()

#----------------------------
# Reliability
#----------------------------
if ("OPS_Reliability" IN_LIST OPS_Extension_List)
add_compile_definitions(_RELIABILITY)
target_link_libraries(${OPS_FINAL_TARGET} OPS_Reliability)
endif()

#----------------------------
# ASDEA
#----------------------------
if (OPS_Use_ASDEA)
target_link_libraries(${OPS_FINAL_TARGET} OPS_ASDEA)
endif()

#----------------------------
# PFEM
#----------------------------
if (OPS_Use_PFEM)
message("OPS >>> Including OPS_PFEM option")
#target_link_libraries(${OPS_FINAL_TARGET} OPS_PFEM)
endif()

#----------------------------
# HDF5
Expand Down
9 changes: 2 additions & 7 deletions Conf.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,6 @@ option(FMK
option(OPS_Use_Graphics
"Include graphics" OFF)

option(OPS_Use_PFEM
"Include PFEM library" OFF)

option(OPS_Use_ASDEA
"Include ASDEA library" ON)

option(OPS_Use_DRM
"DRM lib" ON)
Expand All @@ -57,8 +52,8 @@ option(OPS_Use_Thermal
# (e.g. using OPS_Element_truss defines the macro _OPS_ELEMENT_TRUSS)
#==============================================================================
set(OPS_Extension_List

OPS_Reliability # TODO: replace existing tests on '_RELIABILITY'
OPS_ASDEA
#OPS_Reliability # TODO: replace existing tests on '_RELIABILITY'

OPS_NumLib_PETSC
OPS_NumLib_METIS
Expand Down

0 comments on commit d1cfc1e

Please sign in to comment.