Commit 02e1a0ee authored by Brian Panneton's avatar Brian Panneton
Browse files

FIX: Fixed up install to add loki to core, add python core and java libraries.

parent 9f463340
......@@ -66,8 +66,10 @@ if(XDMF_WRAP_PYTHON)
if("${ARGN}" STRGREATER "")
add_dependencies(${python_name} "${ARGN}")
endif("${ARGN}" STRGREATER "")
install(FILES ${CMAKE_BINARY_DIR}/Xdmf.py DESTINATION lib/python)
install(TARGETS ${SWIG_MODULE_Xdmf_REAL_NAME} DESTINATION lib/python)
install(FILES ${CMAKE_BINARY_DIR}/${python_name}.py
DESTINATION lib/python)
install(TARGETS ${SWIG_MODULE_${python_name}_REAL_NAME}
DESTINATION lib/python)
ENDMACRO(XDMF_SWIG_PYTHON)
endif(XDMF_WRAP_PYTHON)
......@@ -118,6 +120,7 @@ if(XDMF_WRAP_JAVA)
${CMAKE_BINARY_DIR}/${java_name}.jar
${XDMF_JAVA_DIR}
)
install(FILES ${CMAKE_BINARY_DIR}/${java_name}.jar DESTINATION lib/java)
ENDMACRO(XDMF_SWIG_JAVA)
endif(XDMF_WRAP_JAVA)
......
......@@ -83,7 +83,9 @@ if(XDMF_WRAP_PYTHON)
endif(XDMF_WRAP_PYTHON)
file(GLOB XdmfCoreHeaders *.hpp)
file(GLOB LokiHeaders loki/*.h)
install(FILES ${XdmfCoreHeaders} DESTINATION include)
install(FILES ${LokiHeaders} DESTINATION include/loki)
install(TARGETS XdmfCore LIBRARY DESTINATION lib)
set(XdmfCore_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} ${HDF5_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} CACHE INTERNAL "")
......
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