Commit 3db67d0d authored by Andy Cedilnik's avatar Andy Cedilnik
Browse files

Fix Expat library issues

parent b3ae1517
......@@ -148,8 +148,6 @@ CMAKE_EXPORT_BUILD_SETTINGS(${Xdmf_BINARY_DIR}/XDMFBuildSettings.cmake)
SET(XDMF_BUILD_SETTINGS_FILE ${Xdmf_BINARY_DIR}/XDMFBuildSettings.cmake)
SET(XDMF_USE_FILE "${Xdmf_SOURCE_DIR}/UseXDMF.cmake")
SET(XDMF_EXPAT_LIBRARIES ${EXPAT_LIBRARY})
SET(XDMF_EXPAT_INCLUDE_DIRS ${EXPAT_INCLUDE_DIR})
SET(XDMF_HDF5_LIBRARIES ${HDF5_LIBRARY})
# Save library dependencies.
......
......@@ -66,7 +66,7 @@ ELSE(XDMF_BUILD_SHARED_LIBS)
ADD_LIBRARY(Xdmf STATIC ${XdmfSources})
ENDIF(XDMF_BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(Xdmf ${HDF5_LIBRARY} ${EXPAT_LIBRARY})
TARGET_LINK_LIBRARIES(Xdmf ${HDF5_LIBRARY} ${XDMF_EXPAT_LIBRARIES})
OPTION(XDMF_WRAP_PYTHON "Build a Python wrapping interface" ON)
IF(XDMF_WRAP_PYTHON)
......@@ -76,7 +76,7 @@ IF(XDMF_WRAP_PYTHON)
INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
INCLUDE (${CMAKE_ROOT}/Modules/FindPythonLibs.cmake)
ADD_LIBRARY(_Xdmf SHARED ${XdmfSources} ${XdmfPythonSource})
TARGET_LINK_LIBRARIES(_Xdmf ${PYTHON_LIBRARY} ${HDF5_LIBRARY} ${EXPAT_LIBRARY})
TARGET_LINK_LIBRARIES(_Xdmf ${PYTHON_LIBRARY} ${HDF5_LIBRARY} ${XDMF_EXPAT_LIBRARIES})
SET_TARGET_PROPERTIES(_Xdmf PROPERTIES PREFIX "")
ENDIF(XDMF_WRAP_PYTHON)
......@@ -88,7 +88,7 @@ IF(XDMF_WRAP_TCL)
INCLUDE_DIRECTORIES(${TCL_INCLUDE_PATH})
INCLUDE (${CMAKE_ROOT}/Modules/FindTCL.cmake)
ADD_LIBRARY(XdmfTCL SHARED ${XdmfSources} ${XdmfTclSource})
TARGET_LINK_LIBRARIES(XdmfTCL ${TCL_LIBRARY} ${HDF5_LIBRARY} ${EXPAT_LIBRARY})
TARGET_LINK_LIBRARIES(XdmfTCL ${TCL_LIBRARY} ${HDF5_LIBRARY} ${XDMF_EXPAT_LIBRARIES})
ADD_EXECUTABLE(DummyTCL dummy.cxx)
TARGET_LINK_LIBRARIES(DummyTCL XdmfTCL)
ENDIF(XDMF_WRAP_TCL)
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