Merge pull request #1540 from pshriwise/dagmc-target

Switch to using the DAGMC targets in CMake.

.travis.yml

@@ -1,3 +1,4 @@
+
 sudo: required
 dist: xenial
 language: python
@@ -21,11 +22,11 @@ cache:
 env:
   global:
     - MPI_DIR=/usr
+    - DAGMC_ROOT=$HOME/DAGMC
     - HDF5_ROOT=/usr
     - OMP_NUM_THREADS=2
     - OPENMC_CROSS_SECTIONS=$HOME/nndc_hdf5/cross_sections.xml
     - OPENMC_ENDF_DATA=$HOME/endf-b-vii.1
-    - LD_LIBRARY_PATH=$HOME/MOAB/lib:$HOME/DAGMC/lib
     - PATH=$PATH:$HOME/NJOY2016/build
     - COVERALLS_PARALLEL=true
     - NUMPY_EXPERIMENTAL_ARRAY_FUNCTION=0

CMakeLists.txt

@@ -39,14 +39,7 @@ endif()
 # DAGMC Geometry Support - need DAGMC/MOAB
 #===============================================================================
 if(dagmc)
-  find_package(DAGMC REQUIRED)
-  add_library(dagmc-imported INTERFACE IMPORTED)
-  link_directories(${DAGMC_LIBRARY_DIRS})
-  set_target_properties(dagmc-imported PROPERTIES
-    INTERFACE_LINK_LIBRARIES "${DAGMC_LIBRARIES}"
-    INTERFACE_INCLUDE_DIRECTORIES "${DAGMC_INCLUDE_DIRS}")
-else()
-  set(DAGMC_FOUND false)
+  find_package(DAGMC REQUIRED PATH_SUFFIXES lib/cmake)
 endif()
 
 #===============================================================================
@@ -371,7 +364,7 @@ target_link_libraries(libopenmc ${ldflags} ${HDF5_LIBRARIES} ${HDF5_HL_LIBRARIES
 
 if(dagmc)
   target_compile_definitions(libopenmc PRIVATE DAGMC)
-  target_link_libraries(libopenmc dagmc-imported)
+  target_link_libraries(libopenmc dagmc-shared uwuw-shared)
 endif()
 
 #===============================================================================

cmake/Modules/FindDAGMC.cmake

@@ -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()

cmake/OpenMCConfig.cmake.in

@@ -6,13 +6,7 @@ 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})
+  find_package(DAGMC REQUIRED HINTS @DAGMC_DIR@)
 endif()
 
 if(NOT TARGET OpenMC::libopenmc)

tools/ci/travis-install-dagmc.sh

@@ -24,7 +24,6 @@ make -j && make -j install
 cmake ../moab -DBUILD_SHARED_LIBS=OFF
 make -j install
 rm -rf $HOME/MOAB/moab $HOME/MOAB/build
-export LD_LIBRARY_PATH=$MOAB_INSTALL_DIR/lib:$LD_LIBRARY_PATH
 
 # DAGMC Install
 cd $HOME
@@ -34,6 +33,5 @@ mkdir build && cd build
 cmake ../dagmc -DBUILD_TALLY=ON -DCMAKE_INSTALL_PREFIX=$DAGMC_INSTALL_DIR -DMOAB_DIR=$MOAB_INSTALL_DIR
 make -j install
 rm -rf $HOME/DAGMC/dagmc $HOME/DAGMC/build
-export LD_LIBRARY_PATH=$DAGMC_INSTALL_DIR/lib:$LD_LIBRARY_PATH
 
 cd $CURRENT_DIR