From ac2e1665e81dff8dc070aa9eb035668693708fc0 Mon Sep 17 00:00:00 2001
From: Patrick Shriwise <pshriwise@gmail.com>
Date: Tue, 7 Apr 2020 01:32:41 -0500
Subject: [PATCH] Removing dagmc-imported target export and FindDAGMC.cmake
 files as suggested by @paulromano.

---
 cmake/Modules/FindDAGMC.cmake | 20 --------------------
 cmake/OpenMCConfig.cmake.in   |  9 ---------
 tools/ci/travis-install.py    |  2 ++
 3 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 cmake/Modules/FindDAGMC.cmake

diff --git a/cmake/Modules/FindDAGMC.cmake b/cmake/Modules/FindDAGMC.cmake
deleted file mode 100644
index bb9bc56dd..000000000
--- a/cmake/Modules/FindDAGMC.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
-# Try to find DAGMC
-#
-# Once done this will define
-#
-#  DAGMC_FOUND - system has DAGMC
-#  DAGMC_INCLUDE_DIRS - the DAGMC include directory
-#  DAGMC_LIBRARIES - Link these to use DAGMC
-#  DAGMC_DEFINITIONS - Compiler switches required for using DAGMC
-
-find_path(DAGMC_CMAKE_CONFIG NAMES DAGMCConfig.cmake
-          HINTS ${DAGMC_ROOT} $ENV{DAGMC_ROOT}
-          PATHS ENV LD_LIBRARY_PATH
-          PATH_SUFFIXES lib Lib cmake lib/cmake
-          NO_DEFAULT_PATH)
-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.in b/cmake/OpenMCConfig.cmake.in
index 1c6a488f5..29a0e4542 100644
--- a/cmake/OpenMCConfig.cmake.in
+++ b/cmake/OpenMCConfig.cmake.in
@@ -5,15 +5,6 @@ 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_libraries(dagmc-imported INTERFACE ${DAGMC_LIBRARIES})
-  foreach(dir ${DAGMC_LIBRARY_DIRS})
-    target_link_libraries(dagmc-imported INTERFACE "-L${dir}")
-  endforeach()
-  target_include_directories(dagmc-imported INTERFACE ${DAGMC_INCLUDE_DIRS})
-endif()
 
 if(NOT TARGET OpenMC::libopenmc)
   include("${OpenMC_CMAKE_DIR}/OpenMCTargets.cmake")
diff --git a/tools/ci/travis-install.py b/tools/ci/travis-install.py
index a2b1b6175..80c7c42ee 100644
--- a/tools/ci/travis-install.py
+++ b/tools/ci/travis-install.py
@@ -47,6 +47,8 @@ def install(omp=False, mpi=False, phdf5=False, dagmc=False):
 
     if dagmc:
         cmake_cmd.append('-Ddagmc=ON')
+        home_dir = os.environ.get('HOME')
+        cmake_cmd.append('-DCMAKE_PREFIX_PATH={}/DAGMC/lib'.format(home_dir))
 
     # Build in coverage mode for coverage testing
     cmake_cmd.append('-Dcoverage=on')