diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec6b500b4..c776a7747 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,6 +9,11 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 # Set module path
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules)
 
+# Allow user to specify <project>_ROOT variables
+if (NOT (CMAKE_VERSION VERSION_LESS 3.12))
+  cmake_policy(SET CMP0074 NEW)
+endif()
+
 #===============================================================================
 # Command line options
 #===============================================================================
@@ -35,18 +40,18 @@ endif()
 #===============================================================================
 if(dagmc)
   find_package(DAGMC REQUIRED)
-  link_directories(${DAGMC_LIBRARY_DIRS})
+  add_library(dagmc-imported INTERFACE IMPORTED)
+  target_link_directories(dagmc-imported INTERFACE ${DAGMC_LIBRARY_DIRS})
+  target_link_libraries(dagmc-imported INTERFACE ${DAGMC_LIBRARIES})
+  target_include_directories(dagmc-imported INTERFACE ${DAGMC_INCLUDE_DIRS})
+else()
+  set(DAGMC_FOUND false)
 endif()
 
 #===============================================================================
 # HDF5 for binary output
 #===============================================================================
 
-# Allow user to specify HDF5_ROOT
-if (NOT (CMAKE_VERSION VERSION_LESS 3.12))
-  cmake_policy(SET CMP0074 NEW)
-endif()
-
 # Unfortunately FindHDF5.cmake will always prefer a serial HDF5 installation
 # over a parallel installation if both appear on the user's PATH. To get around
 # this, we check for the environment variable HDF5_ROOT and if it exists, use it
@@ -357,8 +362,7 @@ target_link_libraries(libopenmc ${ldflags} ${HDF5_LIBRARIES} ${HDF5_HL_LIBRARIES
 
 if(dagmc)
   target_compile_definitions(libopenmc PRIVATE DAGMC)
-  target_link_libraries(libopenmc ${DAGMC_LIBRARIES})
-  target_include_directories(libopenmc PRIVATE ${DAGMC_INCLUDE_DIRS})
+  target_link_libraries(libopenmc dagmc-imported)
 endif()
 
 #===============================================================================
@@ -388,6 +392,8 @@ add_custom_command(TARGET libopenmc POST_BUILD
 # Install executable, scripts, manpage, license
 #===============================================================================
 
+configure_file(cmake/OpenMCConfig.cmake.in "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/OpenMCConfig.cmake" @ONLY)
+
 set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/OpenMC)
 install(TARGETS openmc libopenmc faddeeva
   EXPORT openmc-targets
@@ -401,7 +407,7 @@ install(EXPORT openmc-targets
   DESTINATION ${INSTALL_CONFIGDIR})
 
 install(DIRECTORY src/relaxng DESTINATION ${CMAKE_INSTALL_DATADIR}/openmc)
-install(FILES cmake/OpenMCConfig.cmake DESTINATION ${INSTALL_CONFIGDIR})
+install(FILES "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/OpenMCConfig.cmake" DESTINATION ${INSTALL_CONFIGDIR})
 install(FILES man/man1/openmc.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
 install(FILES LICENSE DESTINATION "${CMAKE_INSTALL_DOCDIR}" RENAME copyright)
 install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
diff --git a/cmake/Modules/FindDAGMC.cmake b/cmake/Modules/FindDAGMC.cmake
index c644c8886..bb9bc56dd 100644
--- a/cmake/Modules/FindDAGMC.cmake
+++ b/cmake/Modules/FindDAGMC.cmake
@@ -12,7 +12,9 @@ find_path(DAGMC_CMAKE_CONFIG NAMES DAGMCConfig.cmake
           PATHS ENV LD_LIBRARY_PATH
           PATH_SUFFIXES lib Lib cmake lib/cmake
           NO_DEFAULT_PATH)
-
-message(STATUS "Found DAGMC in ${DAGMC_CMAKE_CONFIG}")
-
-include(${DAGMC_CMAKE_CONFIG}/DAGMCConfig.cmake)
+if(DAGMC_CMAKE_CONFIG)
+  message(STATUS "Found DAGMC in ${DAGMC_CMAKE_CONFIG}")
+  include(${DAGMC_CMAKE_CONFIG}/DAGMCConfig.cmake)
+else()
+  message(WARNING "Cound not find DAGMC")
+endif()
diff --git a/cmake/OpenMCConfig.cmake b/cmake/OpenMCConfig.cmake.in
similarity index 58%
rename from cmake/OpenMCConfig.cmake
rename to cmake/OpenMCConfig.cmake.in
index 29a0e4542..ad00a2861 100644
--- a/cmake/OpenMCConfig.cmake
+++ b/cmake/OpenMCConfig.cmake.in
@@ -5,6 +5,13 @@ find_package(gsl-lite REQUIRED HINTS ${OpenMC_CMAKE_DIR}/../gsl-lite)
 find_package(pugixml REQUIRED HINTS ${OpenMC_CMAKE_DIR}/../pugixml)
 find_package(xtl REQUIRED HINTS ${OpenMC_CMAKE_DIR}/../xtl)
 find_package(xtensor REQUIRED HINTS ${OpenMC_CMAKE_DIR}/../xtensor)
+if(@DAGMC_FOUND@)
+  find_package(DAGMC REQUIRED HINTS @DAGMC_LIBRARY_DIRS@)
+  add_library(dagmc-imported INTERFACE IMPORTED)
+  target_link_directories(dagmc-imported INTERFACE ${DAGMC_LIBRARY_DIRS})
+  target_link_libraries(dagmc-imported INTERFACE ${DAGMC_LIBRARIES})
+  target_include_directories(dagmc-imported INTERFACE ${DAGMC_INCLUDE_DIRS})
+endif()
 
 if(NOT TARGET OpenMC::libopenmc)
   include("${OpenMC_CMAKE_DIR}/OpenMCTargets.cmake")