cmp - clean cmake files

zhuminjie · Sep 20, 2021 · 0fed56b · 0fed56b
1 parent 289594c
commit 0fed56b
Show file tree

Hide file tree

Showing 11 changed files with 67 additions and 202 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -408,7 +408,7 @@ endif()
 # Extensions
 #----------------------------
 message("OPS >>> Configuring OpenSees extensions")
-foreach(extension IN LISTS OPS_Element_List OPS_Extension_List)
+foreach(extension IN LISTS OPS_SysOfEqn_List OPS_Element_List OPS_Extension_List)
     string(TOUPPER "${extension}" ext_flag) 
     string(REGEX REPLACE "^OPS_" "OPSDEF_" ext_flag "${ext_flag}")
     # message("    Adding macro definition '${ext_flag}'")

diff --git a/Conf.cmake b/Conf.cmake
@@ -46,57 +46,57 @@ set(OPS_Numlib_List
 
 set(OPS_SysOfEqn_List
   OPS_SysOfEqn_UMF
+  #OPS_SysOfEqn_ITPACK
+  #OPS_NumLib_PETSC
+  #OPS_NumLib_METIS
 )
 
 set(OPS_Extension_List
-    OPS_ASDEA
-    #OPS_Reliability       # TODO: replace existing tests on '_RELIABILITY'
+  OPS_ASDEA
+  #OPS_Reliability       # TODO: replace existing tests on '_RELIABILITY'
 
-    #OPS_NumLib_PETSC
-    #OPS_NumLib_METIS
-    #OPS_UMFPACK
 
-    OPS_Graphics
-    OPS_Renderer 
-    OPS_Renderer_GLX      # TODO: replace existing tests on '_GLX'
-    OPS_Renderer_X11
+  OPS_Graphics
+  OPS_Renderer 
+  OPS_Renderer_GLX      # TODO: replace existing tests on '_GLX'
+  OPS_Renderer_X11
 )
 
 set(OPS_Element_List
-    #OPS_Material_StressDensity
-    #OPS_Uniaxial_Fedeas
-    OPS_Element_truss
-    #OPS_Element_beam2d
-    OPS_Element_beam3d
-    OPS_Element_dispBeamColumnInt
-    OPS_Element_forceBeamColumn
-    OPS_Element_mixedBeamColumn
-    #OPS_Element_beamWithHinges
-    OPS_Element_LHMYS
-    #OPS_Element_Dmglib
-    OPS_Element_PML
-    OPS_Element_RockingBC
-    OPS_Element_UP_ucsd
-    OPS_Element_absorbentBoundaries
-    OPS_Element_adapter
-    OPS_Element_catenaryCable
-    OPS_Element_componentElement
+  #OPS_Material_StressDensity
+  OPS_Uniaxial_Fedeas
+  OPS_Element_truss
+  #OPS_Element_beam2d
+  OPS_Element_beam3d
+  OPS_Element_dispBeamColumnInt
+  OPS_Element_forceBeamColumn
+  OPS_Element_mixedBeamColumn
+  #OPS_Element_beamWithHinges
+  OPS_Element_LHMYS
+  #OPS_Element_Dmglib
+  OPS_Element_PML
+  OPS_Element_RockingBC
+  OPS_Element_UP_ucsd
+  OPS_Element_absorbentBoundaries
+  OPS_Element_adapter
+  OPS_Element_catenaryCable
+  OPS_Element_componentElement
 
-    OPS_Element_elastomericBearing
-    OPS_Element_frictionBearing
+  OPS_Element_elastomericBearing
+  OPS_Element_frictionBearing
 
-    OPS_Element_generic
-    OPS_Element_gradientInelasticBeamColumn
-    OPS_Element_joint
-    OPS_Element_mvlem
-    OPS_Element_pyMacro
-    OPS_Element_shell
-    OPS_Element_surfaceLoad
-    OPS_Element_updatedLagrangianBeamColumn
-    OPS_Element_masonry
-    #OPS_Element_feap
-    #OPS_Element_PFEMElement
-    OPS_Element_CEq
+  OPS_Element_generic
+  OPS_Element_gradientInelasticBeamColumn
+  OPS_Element_joint
+  OPS_Element_mvlem
+  OPS_Element_pyMacro
+  OPS_Element_shell
+  OPS_Element_surfaceLoad
+  OPS_Element_updatedLagrangianBeamColumn
+  OPS_Element_masonry
+  #OPS_Element_feap
+  #OPS_Element_PFEMElement
+  OPS_Element_CEq
 )
 
 
diff --git a/ETC/cmake/OpenSeesDependenciesUnix.cmake b/ETC/cmake/OpenSeesDependenciesUnix.cmake
@@ -74,6 +74,6 @@ opensees_load(MySQL                                          FIND)
 
 # Integrated exteral libraries
 opensees_load(FEDEAS_Uniaxial
-  LIBRARY FALSE
+  LIBRARY /home/claudio/pkgs/FEDEAS/bin/src/uniaxial/libfedeas_uniaxial.a
 )
 
diff --git a/ETC/help/dependencies.md b/ETC/help/dependencies.md
diff --git a/ETC/scripts/arpack_errors.sh b/ETC/scripts/arpack_errors.sh
diff --git a/OTHER/AMD/CMakeLists.txt b/OTHER/AMD/CMakeLists.txt
@@ -14,15 +14,10 @@
 # Claudio Perez
 
 project(AMD)
-
-add_library(AMD)
-
-target_compile_options(AMD PRIVATE -fexceptions -fPIC -I.)
-
 #-------------------------------------------------------------------------------
 # source files
 #-------------------------------------------------------------------------------
-target_sources(AMD PRIVATE
+set(AMD_SOURCES
   amd_aat.c
   amd_1.c
   amd_2.c
@@ -35,23 +30,23 @@ target_sources(AMD PRIVATE
   amd_info.c
   amd_valid.c
   amd_preprocess.c
-  SuiteSparse_config.c
 )
 
-
 #-------------------------------------------------------------------------------
 # compile each int and long routine (with no real/complex version)
 #-------------------------------------------------------------------------------
 
-#amd_i_%.o: amd_%.c $(INC)
-#	$(C) -DDINT -c $< -o $@
-#
-## amd_l_%.o: amd_%.c $(INC)
-## 	$(C) -DDLONG -c $< -o $@
-#
-#$(AMD_LIBRARY): $(AMDI) SuiteSparse_config.o
-#	@$(RM) $(RMFLAGS) $(AMD_LIBRARY)
-#	@$(AR) $(ARFLAGS) $(AMD_LIBRARY) $(AMDI) SuiteSparse_config.o
-#	@$(RANLIB) $(AMD_LIBRARY)
+add_library(AMD_DINT ${AMD_SOURCES})
+target_compile_definitions(AMD_DINT PRIVATE DINT)
+target_compile_options(AMD_DINT PRIVATE -fexceptions -fPIC -I.)
+
+add_library(AMD_DLNG ${AMD_SOURCES})
+target_compile_definitions(AMD_DINT PRIVATE DLONG)
+target_compile_options(AMD_DLNG PRIVATE -fexceptions -fPIC -I.)
+
+#-------------------------------------------------------------------------------
+
+add_library(AMD SuiteSparse_config.c)
+target_link_libraries(AMD PRIVATE AMD_DINT AMD_DLNG)
 
 
diff --git a/OTHER/ARPACK/CMakeLists.txt b/OTHER/ARPACK/CMakeLists.txt
@@ -3,11 +3,9 @@
 #        OpenSees -- Open System For Earthquake Engineering Simulation
 #                Pacific Earthquake Engineering Research Center
 #
-#     (c) Copyright 1999-2021 The Regents of the University of California
-#                             All Rights Reserved
-# (Copyright and Disclaimer @ http://www.berkeley.edu/OpenSees/copyright.html)
-#
 #------------------------------------------------------------------------------
+#   arpack.caam.rice.edu
+#==============================================================================
 # Claudio Perez
 
 project(ARPACK Fortran)

diff --git a/OTHER/CBLAS/CMakeLists.txt b/OTHER/CBLAS/CMakeLists.txt
diff --git a/OTHER/CSPARSE/CMakeLists.txt b/OTHER/CSPARSE/CMakeLists.txt
@@ -3,10 +3,6 @@
 #        OpenSees -- Open System For Earthquake Engineering Simulation
 #                Pacific Earthquake Engineering Research Center
 #
-#     (c) Copyright 1999-2021 The Regents of the University of California
-#                             All Rights Reserved
-#        (Licensing @ http://www.berkeley.edu/OpenSees/copyright.html)
-#
 #------------------------------------------------------------------------------
 #                       CSPARSE version 3.1.0, Jun 1 2012
 #                Timothy A. Davis, http://www.suitesparse.com

diff --git a/SRC/element/PFEMElement/CMakeLists.txt b/SRC/element/PFEMElement/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_library(OPS_Element_PFEMElement )#OBJECT)
+add_library(OPS_Element_PFEMElement)
 
 target_sources(OPS_Element_PFEMElement
     PRIVATE
@@ -25,8 +25,8 @@ target_sources(OPS_Element_PFEMElement
         PFEMElement2DQuasi.cpp
         PFEMElement3DBubble.cpp
         PFEMElement3D.cpp
-    #PFEMElement3Dmini.cpp
-    #PFEMMesher2D.cpp
+        #PFEMElement3Dmini.cpp
+        #PFEMMesher2D.cpp
         PFEMMesher3D.cpp
         QuadMesh.cpp
         QuadMeshGenerator.cpp
@@ -62,8 +62,8 @@ target_sources(OPS_Element_PFEMElement
         PFEMElement2DQuasi.h
         PFEMElement3DBubble.h
         PFEMElement3D.h
-    #PFEMElement3Dmini.h
-    #PFEMMesher2D.h
+       #PFEMElement3Dmini.h
+       #PFEMMesher2D.h
         PFEMMesher3D.h
         QuadMeshGenerator.h
         QuadMesh.h
@@ -75,5 +75,6 @@ target_sources(OPS_Element_PFEMElement
         TriGaussPoints.h
         TriMesh.h
 )
+
 target_include_directories(OPS_Element_PFEMElement PUBLIC ${CMAKE_CURRENT_LIST_DIR})
 
diff --git a/SRC/material/uniaxial/fedeas/CMakeLists.txt b/SRC/material/uniaxial/fedeas/CMakeLists.txt
@@ -37,6 +37,8 @@ target_sources(OPS_Uniaxial_Fedeas_f
 )
 target_link_libraries(OPS_Uniaxial_Fedeas PUBLIC
   OPS_Uniaxial_Fedeas_f
-  ${BUNDLE_LIBS}/fedeas.lib)
+  ${FEDEAS_Uniaxial_LIBRARIES}
+  #${BUNDLE_LIBS}/fedeas.lib
+)
 #target_include_directories(OPS_Material PUBLIC ${CMAKE_CURRENT_LIST_DIR})