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

resolve merge conflict

parent 32d43b30
......@@ -381,10 +381,10 @@ if(NOT XDMF_BUILD_CORE_ONLY)
" properly without shared libraries")
endif (NOT BUILD_SHARED_LIBS)
if (XDMF_BUILD_DSM)
XDMF_SWIG_PYTHON(Xdmf XdmfCore XdmfDSM)
else (XDMF_BUILD_DSM)
XDMF_SWIG_PYTHON(Xdmf XdmfCore)
endif (XDMF_BUILD_DSM)
XDMF_SWIG_PYTHON(${XDMF_LIBNAME} XdmfCore XdmfDSM)
else()
XDMF_SWIG_PYTHON(${XDMF_LIBNAME} XdmfCore)
endif()
set(XDMF_PYTHON_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib/python/)
endif()
......
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