From b5a0d5f6261c67e0a0e472a7c10b90a3b798e303 Mon Sep 17 00:00:00 2001 From: claudioperez <50180406+claudioperez@users.noreply.github.com> Date: Mon, 23 Aug 2021 11:28:19 -0700 Subject: [PATCH] cmp --- Conf.cmake | 3 +-- ETC/cmake/OpenSeesDependenciesWin.cmake | 18 ++---------------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/Conf.cmake b/Conf.cmake index 2c0271a31..8a9071e64 100644 --- a/Conf.cmake +++ b/Conf.cmake @@ -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 @@ -100,7 +99,7 @@ set(OPS_Element_List OPS_Element_updatedLagrangianBeamColumn OPS_Element_masonry #OPS_Element_feap - #OPS_Element_PFEMElement + OPS_Element_PFEMElement ) diff --git a/ETC/cmake/OpenSeesDependenciesWin.cmake b/ETC/cmake/OpenSeesDependenciesWin.cmake index ab6731fae..74a256b2a 100644 --- a/ETC/cmake/OpenSeesDependenciesWin.cmake +++ b/ETC/cmake/OpenSeesDependenciesWin.cmake @@ -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( [BUILD|FIND|SEARCH|PATHS] []) # @@ -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 @@ -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/ )