fix Fortran CMake

zhuminjie · Jul 23, 2021 · 7543276 · 7543276
1 parent bd018c3
commit 7543276
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -304,7 +304,7 @@ target_sources(OpenSees
 	"${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/OpenSeesCommands.cpp"
     "${OPS_SRC_DIR}/interpreter/OpenSeesElementCommands.cpp"
 	"${OPS_SRC_DIR}/interpreter/OpenSeesSectionCommands.cpp"
     "${OPS_SRC_DIR}/interpreter/OpenSeesUniaxialMaterialCommands.cpp"
@@ -418,7 +418,7 @@ target_sources(OPS_Tcl PRIVATE
 
 	#"${OPS_SRC_DIR}/api/elementAPI_TCL.cpp"
 	"${OPS_SRC_DIR}/tcl/commands.cpp"
-    "${OPS_SRC_DIR}/tcl/TclFeViewer.cpp"
+  "${OPS_SRC_DIR}/tcl/TclFeViewer.cpp"
 
     #"${OPS_SRC_DIR}/interpreter/TclInterpreter.cpp"
     "${OPS_SRC_DIR}/interpreter/TclWrapper.cpp"

diff --git a/Conf.cmake b/Conf.cmake
@@ -68,7 +68,7 @@ set(OPS_Extension_List
     OPS_NumLib_METIS
     OPS_NumLib_UMFPACK
 
-    OPS_ExtLib_PFEM
+    #OPS_ExtLib_PFEM
 
     OPS_Graphics
     OPS_Renderer 
@@ -87,7 +87,8 @@ set(OPS_Element_List
 
     #OPS_Element_beamWithHinges
     OPS_Element_LHMYS
-    OPS_Element_PML
+    #OPS_Element_Dmglib
+    #OPS_Element_PML
     OPS_Element_RockingBC
     OPS_Element_UP_ucsd
     OPS_Element_absorbentBoundaries

diff --git a/SRC/api/CMakeLists.txt b/SRC/api/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_library(OPS_Api OBJECT)
 
 target_sources(OPS_Api
-    PRIVATE
+    PUBLIC
         #elementAPI_Dummy.cpp
         elementAPI_TCL.cpp
         packages.cpp

diff --git a/SRC/element/CMakeLists.txt b/SRC/element/CMakeLists.txt
@@ -70,6 +70,7 @@ add_subdirectory(UP-ucsd)
 add_subdirectory(UWelements)
 add_subdirectory(HUelements)
 add_subdirectory(XMUelements)
+add_subdirectory(dmglib)
 
 target_include_directories(OPS_Element PUBLIC ${CMAKE_CURRENT_LIST_DIR})
 
diff --git a/SRC/element/PML/CMakeLists.txt b/SRC/element/PML/CMakeLists.txt
@@ -1,7 +1,7 @@
-add_library(OPS_Element_PML OBJECT)
+#add_library(OPS_Element_PML OBJECT)
 add_library(OPS_Element_PML_f OBJECT)
 
-target_sources(OPS_Element_PML
+target_sources(OPS_Element
     PRIVATE
         PML2D.cpp
         PML3D.cpp
@@ -11,11 +11,12 @@ target_sources(OPS_Element_PML
 )
 
 target_sources(OPS_Element_PML_f
-    PRIVATE
+  PUBLIC
         pml_3d.f
         pml_2d.f
 )
 
-target_link_libraries(OPS_Element_PML PUBLIC OPS_Element_PML_f)
-target_include_directories(OPS_Element_PML PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+#target_link_libraries(OPS_Element_PML PUBLIC OPS_Element_PML_f)
+target_link_libraries(OPS_Element PUBLIC OPS_Element_PML_f)
+#target_include_directories(OPS_Element_PML PUBLIC ${CMAKE_CURRENT_LIST_DIR})
 
diff --git a/SRC/material/nD/stressDensityModel/CMakeLists.txt b/SRC/material/nD/stressDensityModel/CMakeLists.txt
@@ -12,7 +12,7 @@ target_sources(OPS_Material
 )
 add_library(OPS_Material_nD_StressDensity_f OBJECT)
 target_sources(OPS_Material_nD_StressDensity_f
-    PRIVATE
+  PUBLIC
         SDM-UC.f
         SDM3D.f90
         SDM2D.f90

diff --git a/SRC/material/uniaxial/CMakeLists.txt b/SRC/material/uniaxial/CMakeLists.txt
@@ -268,7 +268,7 @@ target_sources(OPS_Material
 
 add_library(OPS_Material_f OBJECT)
 
-target_sources(OPS_Material_f PRIVATE
+target_sources(OPS_Material_f PUBLIC
       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 OBJECT)
-target_sources(OPS_Material_Uniaxial_Drain_f PRIVATE anal00.f common00.f)
+target_sources(OPS_Material_Uniaxial_Drain_f PUBLIC 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})