Merge branch 'dmglib' of github.com:claudioperez/OpenSees into dmglib

zhuminjie · Aug 23, 2021 · 862318a · 862318a
2 parents 6a417fe + ca3f758
commit 862318a
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 95 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -59,7 +59,7 @@ endif()
 
 if(WIN32) # NOTE: this will execute for both 32-bit and 64-bit builds.
     include(OpenSeesDependenciesWin)
-    target_sources(OPS_OS_Specific_libs INTERFACE  ${OPS_SRC_DIR}/api/win32Functions.cpp)
+    # target_sources(OPS_OS_Specific_libs INTERFACE  ${OPS_SRC_DIR}/api/win32Functions.cpp)
     target_link_libraries(OPS_OS_Specific_libs INTERFACE ${CBLAS_LIBRARIES} wsock32 ws2_32)
     message(STATUS ">>> WIN32")
 endif()
@@ -237,20 +237,20 @@ add_library(OPS_Renderer           OBJECT EXCLUDE_FROM_ALL)
 # Packaged libraries
 add_library(G3) 
 add_library(OpenSees         EXCLUDE_FROM_ALL)
-target_sources(OpenSees
-  PRIVATE
-	  "${OPS_SRC_DIR}/interpreter/OpenSeesBeamIntegrationCommands.cpp"
-	  "${OPS_SRC_DIR}/interpreter/OpenSeesCrdTransfCommands.cpp"
-	  "${OPS_SRC_DIR}/interpreter/OpenSeesFrictionModelCommands.cpp"
-	  "${OPS_SRC_DIR}/interpreter/OpenSeesMiscCommands.cpp"
-	  "${OPS_SRC_DIR}/interpreter/OpenSeesNDMaterialCommands.cpp"
-	  "${OPS_SRC_DIR}/interpreter/OpenSeesOutputCommands.cpp"
-    #"${OPS_SRC_DIR}/interpreter/OpenSeesCommands.cpp"
-    "${OPS_SRC_DIR}/interpreter/OpenSeesElementCommands.cpp"
-	  "${OPS_SRC_DIR}/interpreter/OpenSeesSectionCommands.cpp"
-    "${OPS_SRC_DIR}/interpreter/OpenSeesUniaxialMaterialCommands.cpp"
-    "${OPS_SRC_DIR}/renderer/PlainMap.cpp"
-)
+#target_sources(OpenSees
+#  PRIVATE
+#	  "${OPS_SRC_DIR}/interpreter/OpenSeesBeamIntegrationCommands.cpp"
+#	  "${OPS_SRC_DIR}/interpreter/OpenSeesCrdTransfCommands.cpp"
+#	  "${OPS_SRC_DIR}/interpreter/OpenSeesFrictionModelCommands.cpp"
+#	  "${OPS_SRC_DIR}/interpreter/OpenSeesMiscCommands.cpp"
+#	  "${OPS_SRC_DIR}/interpreter/OpenSeesNDMaterialCommands.cpp"
+#	  "${OPS_SRC_DIR}/interpreter/OpenSeesOutputCommands.cpp"
+#    #"${OPS_SRC_DIR}/interpreter/OpenSeesCommands.cpp"
+#    "${OPS_SRC_DIR}/interpreter/OpenSeesElementCommands.cpp"
+#	  "${OPS_SRC_DIR}/interpreter/OpenSeesSectionCommands.cpp"
+#    "${OPS_SRC_DIR}/interpreter/OpenSeesUniaxialMaterialCommands.cpp"
+#    "${OPS_SRC_DIR}/renderer/PlainMap.cpp"
+#)
 
 # Executables
 #------------------------------------------------------------------------------

diff --git a/ETC/cmake/OpenSeesDependenciesConda.cmake b/ETC/cmake/OpenSeesDependenciesConda.cmake
@@ -81,41 +81,3 @@ opensees_load(MySQL                                          #FIND
 
 set(MYSQL_INCLUDE_DIR "${CONDA_ENV}/Library/include/mysql/")
 
-
-
-#==============================================================================
-#                           Select Element Libraries
-#
-# Each element in this list ows and associated macro definition
-#==============================================================================
-set(OPS_Element_List
-    #OPS_Element_PFEMElement
-    #OPS_Element_beamWithHinges
-    #OPS_Element_feap
-    OPS_Element_LHMYS
-    OPS_Element_PML
-    OPS_Element_RockingBC
-    OPS_Element_UP_ucsd
-    OPS_Element_absorbentBoundaries
-    OPS_Element_adapter
-    OPS_Element_beam3d
-    #OPS_Element_beam2d
-    OPS_Element_catenaryCable
-    OPS_Element_componentElement
-    OPS_Element_dispBeamColumnInt
-    OPS_Element_forceBeamColumn
-    OPS_Element_elastomericBearing
-    OPS_Element_frictionBearing
-    OPS_Element_generic
-    OPS_Element_gradientInelasticBeamColumn
-    OPS_Element_joint
-    OPS_Element_mixedBeamColumn
-    OPS_Element_mvlem
-    OPS_Element_pyMacro
-    OPS_Element_shell
-    OPS_Element_surfaceLoad
-    OPS_Element_truss
-    OPS_Element_updatedLagrangianBeamColumn
-)
-
-
diff --git a/ETC/cmake/OpenSeesDependenciesWin.cmake b/ETC/cmake/OpenSeesDependenciesWin.cmake
@@ -80,41 +80,3 @@ opensees_load(MySQL                                          #FIND
 
 set(MYSQL_INCLUDE_DIR "${CONDA_ENV}/Library/include/mysql/")
 
-
-
-#==============================================================================
-#                           Select Element Libraries
-#
-# Each element in this list ows and associated macro definition
-#==============================================================================
-set(OPS_Element_List
-    #OPS_Element_PFEMElement
-    #OPS_Element_beamWithHinges
-    #OPS_Element_feap
-    OPS_Element_LHMYS
-    OPS_Element_PML
-    OPS_Element_RockingBC
-    OPS_Element_UP_ucsd
-    OPS_Element_absorbentBoundaries
-    OPS_Element_adapter
-    OPS_Element_beam3d
-    #OPS_Element_beam2d
-    OPS_Element_catenaryCable
-    OPS_Element_componentElement
-    OPS_Element_dispBeamColumnInt
-    OPS_Element_forceBeamColumn
-    OPS_Element_elastomericBearing
-    OPS_Element_frictionBearing
-    OPS_Element_generic
-    OPS_Element_gradientInelasticBeamColumn
-    OPS_Element_joint
-    OPS_Element_mixedBeamColumn
-    OPS_Element_mvlem
-    OPS_Element_pyMacro
-    OPS_Element_shell
-    OPS_Element_surfaceLoad
-    OPS_Element_truss
-    OPS_Element_updatedLagrangianBeamColumn
-)
-
-
diff --git a/OTHER/ARPACK/CMakeLists.txt b/OTHER/ARPACK/CMakeLists.txt
@@ -60,13 +60,13 @@ target_sources(ARPACK PUBLIC
   ivout.f
   second.f
 )
-target_link_libraries(ARPACK PUBLIC ${LAPACK_LIBRARIES})
+
+target_link_libraries(ARPACK PRIVATE ${LAPACK_LIBRARIES})
 
 # Required on Unix OS family to be able to be linked into shared libraries.
 set_target_properties(${PROJECT_NAME}
                       PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
-
 # Expose public includes to other subprojects through cache variable.
 set(${PROJECT_NAME}_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}
     CACHE INTERNAL "${PROJECT_NAME}: Include Directories" FORCE)

diff --git a/SRC/material/uniaxial/CMakeLists.txt b/SRC/material/uniaxial/CMakeLists.txt
@@ -273,7 +273,7 @@ target_sources(OPS_Material
 
 add_library(OPS_Material_f)
 
-target_sources(OPS_Material_f PUBLIC
+target_sources(OPS_Material_f PRIVATE
       DoddRestrepo.f
       STEELDR.f
       c14-SK-M.f

diff --git a/SRC/material/uniaxial/drain/CMakeLists.txt b/SRC/material/uniaxial/drain/CMakeLists.txt
@@ -15,7 +15,7 @@ target_sources(OPS_Material
 )
 
 add_library(OPS_Material_Uniaxial_Drain_f)
-target_sources(OPS_Material_Uniaxial_Drain_f PUBLIC anal00.f common00.f)
+target_sources(OPS_Material_Uniaxial_Drain_f PRIVATE anal00.f common00.f)
 target_link_libraries(OPS_Material PUBLIC OPS_Material_Uniaxial_Drain_f) 
 
 target_include_directories(OPS_Material PUBLIC ${CMAKE_CURRENT_LIST_DIR})