Skip to content

Commit

Permalink
cmp
Browse files Browse the repository at this point in the history
  • Loading branch information
claudioperez committed Aug 23, 2021
1 parent d1cfc1e commit b5a0d5f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 18 deletions.
3 changes: 1 addition & 2 deletions Conf.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ set(OPS_Element_List
OPS_Element_dispBeamColumnInt
OPS_Element_forceBeamColumn
OPS_Element_mixedBeamColumn

#OPS_Element_beamWithHinges
OPS_Element_LHMYS
#OPS_Element_Dmglib
Expand All @@ -100,7 +99,7 @@ set(OPS_Element_List
OPS_Element_updatedLagrangianBeamColumn
OPS_Element_masonry
#OPS_Element_feap
#OPS_Element_PFEMElement
OPS_Element_PFEMElement
)


18 changes: 2 additions & 16 deletions ETC/cmake/OpenSeesDependenciesWin.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,6 @@
# (Copyright and Disclaimer @ http://www.berkeley.edu/OpenSees/copyright.html)
#
#==============================================================================
# External Libraries
#
# - BLAS_LIBRARIES
# - BLAS_INCLUDE_DIRS
#
# - LAPACK_LIBRARIES
# - LAPACK_INCLUDE_DIRS
#
# - ARPACK_LIBRARIES
#
# - SUPERLU_LIBRARIES
# - SUPERLU_INCLUDE_DIRS
#
#==============================================================================
# Synopsis
# - opensees_load(<PACKAGE> [BUILD|FIND|SEARCH|PATHS] [<PATHS>])
#
Expand All @@ -37,7 +23,7 @@ set(CONDA_DIR "C:/Users/claud/miniconda3")
set(CONDA_ENV "C:/Users/claud/miniconda3/envs/sim")
set(BUNDLE_LIBS "${PROJECT_SOURCE_DIR}/Win64/lib/debug/")

opensees_load(TCL #FIND
opensees_load(TCL
LIBRARY ${CONDA_DIR}/Library/lib/tcl86t.lib
#LIBRARY "${BUNDLE_LIBS}/tcl.lib"
INCLUDE ${CONDA_DIR}/Library/include
Expand All @@ -60,7 +46,7 @@ opensees_load(LAPACK
LIBRARY "${BUNDLE_LIBS}/lapack.lib"
)

set(ENV{SUPERLU_DIR})
#set(ENV{SUPERLU_DIR})
opensees_load(SUPERLU
BUNDLED ${OPS_BUNDLED_DIR}/SuperLU_5.1.1/
)
Expand Down

0 comments on commit b5a0d5f

Please sign in to comment.