updates (#1186)

LLNL · Nov 7, 2023 · 746826b · 746826b
1 parent 3bd10cc
commit 746826b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 50 deletions.
diff --git a/src/libs/blueprint/CMakeLists.txt b/src/libs/blueprint/CMakeLists.txt
@@ -142,27 +142,6 @@ target_include_directories(conduit_blueprint
                            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
                            $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)
 
-
-if(FORTRAN_FOUND)
-    ###############################################################################
-    # Special install targets for conduit fortran modules
-    ###############################################################################
-
-    set(conduit_blueprint_fortran_modules
-        ${CMAKE_Fortran_MODULE_DIRECTORY}/conduit_blueprint.mod
-        ${CMAKE_Fortran_MODULE_DIRECTORY}/conduit_blueprint_mesh.mod
-        ${CMAKE_Fortran_MODULE_DIRECTORY}/conduit_blueprint_mcarray.mod
-        ${CMAKE_Fortran_MODULE_DIRECTORY}/conduit_blueprint_table.mod
-        )
-
-    # Setup install to copy the fortran modules
-    install(FILES
-            ${conduit_blueprint_fortran_modules}
-            DESTINATION include/conduit)
-
-endif()
-
-
 ###################################
 # add conduit_blueprint_verify exe
 ###################################

diff --git a/src/libs/conduit/CMakeLists.txt b/src/libs/conduit/CMakeLists.txt
@@ -192,21 +192,11 @@ endif()
 
 
 ####################################################################
-# Special install targets for conduit fortran modules
+# Install target for conduit fortran modules
 ####################################################################
 if(FORTRAN_FOUND)
-    set(conduit_fortran_modules
-        ${CMAKE_Fortran_MODULE_DIRECTORY}/conduit.mod)
-
-    if(ENABLE_FORTRAN_OBJ_INTERFACE)
-        list(APPEND conduit_fortran_modules
-                    ${CMAKE_Fortran_MODULE_DIRECTORY}/conduit_obj.mod)
-    endif()
-
-    # Setup install to copy the fortran modules
-    install(FILES
-            ${conduit_fortran_modules}
-            DESTINATION include/conduit)
+   install(DIRECTORY
+   ${CMAKE_Fortran_MODULE_DIRECTORY}/
+   DESTINATION include/conduit)
 endif()
 
-
diff --git a/src/libs/relay/CMakeLists.txt b/src/libs/relay/CMakeLists.txt
@@ -301,21 +301,6 @@ if(PYTHON_FOUND)
     add_subdirectory(python)
 endif()
 
-
-###############################################################################
-# Special install targets for conduit fortran modules 
-###############################################################################
-if(FORTRAN_FOUND)
-    set(conduit_relay_fortran_modules
-        ${CMAKE_Fortran_MODULE_DIRECTORY}/conduit_relay.mod)
-
-    # Setup install to copy the fortran modules 
-    install(FILES 
-            ${conduit_relay_fortran_modules}
-            DESTINATION include/conduit)
-endif()
-
-
 ################################################################
 # If we have mpi, add the conduit relay mpi library
 ################################################################