Commit 3984a316 authored by Joseph G. Hennessey's avatar Joseph G. Hennessey

Merge branch 'windows-and-install-fixes' into 'master'

Windows and install fixes

See merge request !34
parents 04146795 27f0411c
......@@ -63,6 +63,8 @@ endif()
include(XdmfFunctions)
option(XDMF_INSTALL_NO_DEVELOPMENT "Prevent install from writing out developement files." OFF)
mark_as_advanced(XDMF_INSTALL_NO_DEVELOPMENT)
# Converting Install Prefix to an absolute path
get_filename_component(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" ABSOLUTE)
......@@ -413,20 +415,12 @@ if(NOT XDMF_BUILD_CORE_ONLY)
SOVERSION ${XDMF_MAJOR_VERSION}
)
if(XDMF_BUILD_DSM)
if (NOT WIN32)
target_link_libraries(${XDMF_LIBNAME} XdmfCore XdmfDSM)
else ()
target_link_libraries(${XDMF_LIBNAME} ${XdmfLibraries} ${XdmfDSMLinkLibraries})
endif ()
target_link_libraries(${XDMF_LIBNAME} XdmfCore XdmfDSM)
if(XDMF_STATIC_AND_SHARED AND BUILD_SHARED_LIBS)
target_link_libraries(Xdmf_Static XdmfCore_Static XdmfDSM_Static)
endif()
else(XDMF_BUILD_DSM)
if (NOT WIN32)
target_link_libraries(${XDMF_LIBNAME} XdmfCore)
else ()
target_link_libraries(${XDMF_LIBNAME} ${XdmfLibraries})
endif ()
target_link_libraries(${XDMF_LIBNAME} XdmfCore)
if(XDMF_STATIC_AND_SHARED AND BUILD_SHARED_LIBS)
target_link_libraries(Xdmf_Static XdmfCore_Static)
endif ()
......@@ -444,22 +438,6 @@ if(NOT XDMF_BUILD_CORE_ONLY)
DEFINE_SYMBOL Xdmf_EXPORTS)
endif()
endif ()
if(NOT MSVC10)
set_target_properties(${XDMF_LIBNAME} PROPERTIES
PREFIX ../
IMPORT_PREFIX ../
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_INSTALL_BINDIR}
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_INSTALL_LIBDIR}/${CMAKE_CFG_INTDIR}/
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_INSTALL_LIBDIR}/${CMAKE_CFG_INTDIR}/)
if(XDMF_STATIC_AND_SHARED AND BUILD_SHARED_LIBS)
set_target_properties(Xdmf_Static PROPERTIES
PREFIX ../
IMPORT_PREFIX ../
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_INSTALL_BINDIR}
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_INSTALL_LIBDIR}/${CMAKE_CFG_INTDIR}/
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_INSTALL_LIBDIR}/${CMAKE_CFG_INTDIR}/)
endif ()
endif()
endif()
if(XDMF_WRAP_JAVA)
......@@ -514,7 +492,9 @@ if(NOT XDMF_BUILD_CORE_ONLY)
"CMake/VersionSuite/*.hpp"
"${CMAKE_CURRENT_BINARY_DIR}/*.hpp"
)
install(FILES ${XdmfHeaders} DESTINATION include)
if (NOT XDMF_INSTALL_NO_DEVELOPMENT)
install(FILES ${XdmfHeaders} DESTINATION include)
endif()
install(TARGETS ${XDMF_LIBNAME}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
......
......@@ -267,22 +267,6 @@ if(WIN32)
DEFINE_SYMBOL XdmfCore_EXPORTS)
endif()
endif()
if(NOT MSVC10)
set_target_properties(XdmfCore PROPERTIES
PREFIX ../
IMPORT_PREFIX ../
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/${CMAKE_CFG_INTDIR}/
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/${CMAKE_CFG_INTDIR}/)
if (XDMF_STATIC_AND_SHARED AND BUILD_SHARED_LIBS)
set_target_properties(XdmfCore_Static PROPERTIES
PREFIX ../
IMPORT_PREFIX ../
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/${CMAKE_CFG_INTDIR}/
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/${CMAKE_CFG_INTDIR}/)
endif ()
endif()
endif()
if(XDMF_WRAP_JAVA)
......@@ -326,9 +310,10 @@ 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)
if (NOT XDMF_INSTALL_NO_DEVELOPMENT)
install(FILES ${XdmfCoreHeaders} DESTINATION include)
install(FILES ${LokiHeaders} DESTINATION include/loki)
endif()
install(TARGETS XdmfCore
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
......
......@@ -1201,16 +1201,6 @@ XdmfArray::setArrayType<long long>()
mArrayType = XdmfArrayType::Int64();
}
#ifdef WIN32
template <>
XDMFCORE_EXPORT
void
XdmfArray::setArrayType<__int64>()
{
mArrayType = XdmfArrayType::Int64();
}
#endif
template <>
XDMFCORE_EXPORT
void
......
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