Merge branch 'contrib-src' of github.com:claudioperez/OpenSees into c…

…ontrib-src
zhuminjie · Sep 20, 2021 · d89ca45 · d89ca45
2 parents 9396552 + 547d78d
commit d89ca45
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -101,7 +101,7 @@ set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> cqls <TARGET> <LINK_FLAGS> <OBJECTS>")
 # Warnings
 opensees_add_cxx_flag(
     GNU  -Wall
-    MSVC /W4
+    MSVC /W0
 )
 
 # Floating-point

diff --git a/ETC/cmake/OpenSeesDependenciesWin.cmake b/ETC/cmake/OpenSeesDependenciesWin.cmake
@@ -48,15 +48,18 @@ opensees_load(LAPACK
 
 #set(ENV{SUPERLU_DIR})
 opensees_load(SUPERLU
-    BUNDLED ${OPS_BUNDLED_DIR}/SuperLU_5.1.1/
+  #BUNDLED ${OPS_BUNDLED_DIR}/SuperLU_5.1.1/
+  LIBRARY ${OPS_BUNDLED_DIR}/bin/SuperLU_5.1.1/Debug/SUPERLU.lib
 )
 
 opensees_load(ARPACK                                       SEARCH
-    BUNDLED ${OPS_BUNDLED_DIR}/ARPACK/
+  #BUNDLED ${OPS_BUNDLED_DIR}/ARPACK/
+  LIBRARY ${OPS_BUNDLED_DIR}/bin/ARPACK/Debug/ARPACK.lib
 )
 
 opensees_load(AMD
-    BUNDLED ${OPS_BUNDLED_DIR}/AMD/
+  #BUNDLED ${OPS_BUNDLED_DIR}/AMD/
+  LIBRARY ${OPS_BUNDLED_DIR}/bin/AMD/Debug/AMD.lib
 )
 
 opensees_load(METIS                                        SEARCH)