Commit ce902eb0 authored by David E. DeMarle's avatar David E. DeMarle

Merge branch 'master' into 'master'

changes for fortran and shared library bulilding with python wrapping

Here are some necessary changes for fortran and for building a shared library with python wrapping

Also please turn on the testing of the fortran test code in the auto testing system.

Thanks,

Joe Hennessey

See merge request !11
parents cdb48e8e 70f5458f
......@@ -192,7 +192,7 @@ if(XDMF_WRAP_PYTHON)
PARENT_SCOPE)
endif()
install(FILES ${CMAKE_CURRENT_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)
......
......@@ -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
......
......@@ -56,6 +56,7 @@
#include "XdmfUnstructuredGrid.hpp"
#include "XdmfWriter.hpp"
#include "XdmfHDF5Writer.hpp"
#include "XdmfHDF5Controller.hpp"
#include "string.h"
#include <stdio.h>
......
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