From ec9c8176830ad0bd293e213143f297304dc559c9 Mon Sep 17 00:00:00 2001
From: "Joseph G. Hennessey" <joseph.g.hennessey2.ctr@mail.mil>
Date: Fri, 1 Jul 2016 13:55:05 -0400
Subject: [PATCH 1/2] changes for fortran and shared library bulilding with
 python wrapping

---
 CMakeLists.txt        | 2 +-
 core/CMakeLists.txt   | 5 +++++
 utils/XdmfFortran.cpp | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5973019e..60a1e02d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -192,7 +192,7 @@ if(XDMF_WRAP_PYTHON)
         PARENT_SCOPE)
     endif()
 
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${python_name}.py
+    install(FILES ${CMAKE_BINARY_DIR}/${python_name}.py
       DESTINATION lib/python)
     install(TARGETS ${SWIG_MODULE_${python_name}Python_REAL_NAME}
       DESTINATION lib/python)
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 53ddbf91..ee39fa19 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -236,6 +236,11 @@ file(GLOB_RECURSE
   "*.hpp" "*.tpp" "*.i"
   "../CMake/VersionSuite/*.hpp")
 file(GLOB LokiHeaders loki/*.h)
+
+set(XdmfCoreHeaders
+      ${XdmfCoreHeaders}
+      ${CMAKE_CURRENT_BINARY_DIR}/XdmfCoreConfig.hpp)
+
 install(FILES ${XdmfCoreHeaders} DESTINATION include)
 install(FILES ${LokiHeaders} DESTINATION include/loki)
 install(TARGETS XdmfCore
diff --git a/utils/XdmfFortran.cpp b/utils/XdmfFortran.cpp
index 2024ec68..51018a01 100644
--- a/utils/XdmfFortran.cpp
+++ b/utils/XdmfFortran.cpp
@@ -56,6 +56,7 @@
 #include "XdmfUnstructuredGrid.hpp"
 #include "XdmfWriter.hpp"
 #include "XdmfHDF5Writer.hpp"
+#include "XdmfHDF5Controller.hpp"
 #include "string.h"
 
 #include <stdio.h>
-- 
GitLab


From 70f5458fd563bb1a30831fb7c7d27ecf5ef8e59c Mon Sep 17 00:00:00 2001
From: "Joseph G. Hennessey" <joseph.g.hennessey2.ctr@mail.mil>
Date: Tue, 5 Jul 2016 11:29:21 -0400
Subject: [PATCH 2/2] Update CMakeLists.txt

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 60a1e02d..5715697d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -192,7 +192,7 @@ if(XDMF_WRAP_PYTHON)
         PARENT_SCOPE)
     endif()
 
-    install(FILES ${CMAKE_BINARY_DIR}/${python_name}.py
+    install(FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${python_name}.py
       DESTINATION lib/python)
     install(TARGETS ${SWIG_MODULE_${python_name}Python_REAL_NAME}
       DESTINATION lib/python)
-- 
GitLab