Commit 0ae7134a authored by Brian Panneton's avatar Brian Panneton

FIX: Corrected gathering of libxml2 and python locations

parent ecff3e67
......@@ -46,7 +46,7 @@ if(XDMF_WRAP_PYTHON)
find_package(PythonLibs REQUIRED)
include_directories(${PYTHON_INCLUDE_DIRS})
set(XDMF_PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE})
set(XDMF_PYTHON_LIBRARY ${PYTHON_LIBRARY})
set(XDMF_PYTHON_LIBRARIES ${PYTHON_LIBRARIES})
set(XDMF_PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS})
# A macro to swig and create the python files
......@@ -100,6 +100,7 @@ if(XDMF_WRAP_JAVA)
set(XDMF_JAVA_INCLUDE_PATH ${JAVA_INCLUDE_PATH})
set(XDMF_JAVA_INCLUDE_PATH2 ${JAVA_INCLUDE_PATH2})
set(XDMF_JAVA_RUNTIME ${JAVA_RUNTIME})
set(XDMF_JAVA_COMPILE ${JAVA_COMPILE})
set(XDMF_JAVA_ARCHIVE ${JAVA_ARCHIVE})
......@@ -234,7 +235,7 @@ if(NOT XDMF_BUILD_CORE_ONLY)
endif(XDMF_BUILD_UTILS)
if(WIN32)
set(XDMF_LIBRARY_CONFIG ${CMAKE_INSTALL_PREFIX}/bin/Xdmf.dll)
set(XDMF_LIBRARY_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/Xdmf.lib)
else(WIN32)
set(XDMF_LIBRARY_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/libXdmf.so)
endif(WIN32)
......
......@@ -7,8 +7,8 @@
# Xdmf Library locations
set(XDMF_DIR "@CMAKE_INSTALL_PREFIX@")
set(XDMF_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/include")
set(XDMF_LIBRARIES "@CMAKE_INSTALL_PREFIX@/lib")
set(XDMF_BINARIES "@CMAKE_INSTALL_PREFIX@/bin")
set(XDMF_LIBRARIES "@XDMF_LIBRARIES@")
set(XDMF_BINARIES "@XDMF_BINARIES@")
set(XDMFCORE_LIBRARY "@XDMFCORE_LIBRARY_CONFIG@")
set(XDMF_LIBRARY "@XDMF_LIBRARY_CONFIG@")
set(XDMF_JAVA_DIR "@CMAKE_INSTALL_PREFIX@/lib/java")
......@@ -39,11 +39,12 @@ set(XDMF_SWIG_EXECUTABLE "@XDMF_SWIG_EXECUTABLE@")
# Xdmf Python Locations
set(XDMF_PYTHON_EXECUTABLE "@XDMF_PYTHON_EXECUTABLE@")
set(XDMF_PYTHON_LIBRARY "@XDMF_PYTHON_LIBRARY@")
set(XDMF_PYTHON_LIBRARIES "@XDMF_PYTHON_LIBRARIES@")
set(XDMF_PYTHON_INCLUDE_DIRS "@XDMF_PYTHON_INCLUDE_DIRS@")
# Xdmf Java Locations
set(XDMF_JAVA_INCLUDE_PATH "@XDMF_JAVA_INCLUDE_PATH@")
set(XDMF_JAVA_INCLUDE_PATH2 "@XDMF_JAVA_INCLUDE_PATH2@")
set(XDMF_JAVA_RUNTIME "@XDMF_JAVA_RUNTIME@")
set(XDMF_JAVA_COMPILE "@XDMF_JAVA_COMPILE@")
set(XDMF_JAVA_ARCHIVE "@XDMF_JAVA_ARCHIVE@")
......@@ -37,7 +37,9 @@ if(HDF5_FOUND)
set(XDMF_HDF5_ROOT_DIR ${HDF5_ROOT})
set(XDMF_HDF5_INCLUDE_DIR ${HDF5_INCLUDE_DIR})
set(XDMF_HDF5_LIBRARIES ${HDF5_LIBRARIES})
set(XDMF_LIBRARIES ${XDMF_LIBRARIES} ${HDF5_LIBRARIES})
set(XDMF_HDF5_BINARY_DIRS ${HDF5_BINARY_DIRS})
set(XDMF_BINARIES ${XDMF_BINARIES} ${HDF5_BINARY_DIRS})
endif(HDF5_FOUND)
if(XDMF_BUILD_DSM)
......@@ -58,12 +60,14 @@ endif(XDMF_BUILD_DSM)
find_package(LibXml2 REQUIRED)
if(LIBXML2_FOUND)
include_directories(${LIBXML2_INCLUDE_DIR})
get_filename_component(LIBXML2_ROOT "${LIBXML2_INCLUDE_DIR}/../../" REALPATH)
get_filename_component(LIBXML2_ROOT "${LIBXML2_INCLUDE_DIR}/../" REALPATH)
set(LIBXML2_BINARY_DIRS ${LIBXML2_ROOT}/bin)
set(XDMF_LIBXML2_ROOT_DIR ${LIBXML2_ROOT})
set(XDMF_LIBXML2_INCLUDE_DIR ${LIBXML2_INCLUDE_DIR})
set(XDMF_LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES})
set(XDMF_LIBRARIES ${XDMF_LIBRARIES} ${LIBXML2_LIBRARIES})
set(XDMF_LIBXML2_BINARY_DIRS ${LIBXML2_BINARY_DIRS})
set(XDMF_BINARIES ${XDMF_BINARIES} ${LIBXML2_BINARY_DIRS})
endif(LIBXML2_FOUND)
set(XdmfCoreSources
......@@ -113,7 +117,7 @@ if(XDMF_WRAP_PYTHON)
endif(XDMF_WRAP_PYTHON)
if(WIN32)
set(XDMFCORE_LIBRARY_CONFIG ${CMAKE_INSTALL_PREFIX}/bin/XdmfCore.dll)
set(XDMFCORE_LIBRARY_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/XdmfCore.lib)
else(WIN32)
set(XDMFCORE_LIBRARY_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/libXdmfCore.so)
endif(WIN32)
......@@ -136,6 +140,8 @@ endif(BUILD_TESTING)
# Since these are not set as of yet, we don't want to remove them from the
# config file
set(XDMF_LIBRARIES ${XDMF_LIBRARIES} ${CMAKE_INSTALL_PREFIX}/lib)
set(XDMF_BINARIES ${XDMF_BINARIES} ${CMAKE_INSTALL_PREFIX}/bin)
set(XDMF_LIBRARY_CONFIG "@XDMF_LIBRARY_CONFIG@")
set(XDMF_JAVA_JAR_CONFIG "@XDMF_JAVA_JAR_CONFIG@")
set(XDMF_PYTHON_CONFIG "@XDMF_PYTHON_CONFIG@")
......
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