Commit 6a2647c0 authored by Andrew J. Burns (Cont's avatar Andrew J. Burns (Cont

Merge branch 'master' of hsai-dev.arl.army.mil:/data/Repository/Xdmf2

parents ce12619f d663dd9d
......@@ -23,6 +23,9 @@ set(CMAKE_MODULE_PATH
include(XdmfFunctions)
# Converting Install Prefix to an absolute path
get_filename_component(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" ABSOLUTE)
# RPath
set(CMAKE_SKIP_BUILD_RPATH FALSE)
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
......@@ -280,6 +283,7 @@ if(NOT XDMF_BUILD_CORE_ONLY)
if(XDMF_WRAP_PYTHON)
XDMF_SWIG_PYTHON(Xdmf XdmfCore XdmfDSM)
set(XDMF_PYTHON_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib/python/)
endif(XDMF_WRAP_PYTHON)
if(BUILD_TESTING)
......
......@@ -182,7 +182,9 @@ set(XdmfCore_INCLUDE_DIRS
${PYTHON_INCLUDE_DIRS}
CACHE INTERNAL "")
set(XDMF_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include PARENT_SCOPE)
set(XDMF_LIBRARIES ${XDMF_LIBRARIES} ${CMAKE_INSTALL_PREFIX}/lib)
set(XDMF_DIR ${CMAKE_INSTALL_PREFIX} PARENT_SCOPE)
set(XDMF_BINARIES ${XDMF_BINARIES} ${CMAKE_INSTALL_PREFIX}/bin)
if(XDMF_BUILD_DSM)
......
......@@ -30,6 +30,7 @@ class XdmfItem;
// Includes
#include <map>
#include <vector>
#include <string>
#include "XdmfCore.hpp"
#include "XdmfSharedPtr.hpp"
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment