Commit 8c5c106f authored by Kenneth Leiter's avatar Kenneth Leiter
Browse files

COMP: Fix XdmfConfig.cmake generation to install into install directory rather...

COMP: Fix XdmfConfig.cmake generation to install into install directory rather than copying at configure time.
parent 30a38ee2
...@@ -243,7 +243,7 @@ if(NOT XDMF_BUILD_CORE_ONLY) ...@@ -243,7 +243,7 @@ if(NOT XDMF_BUILD_CORE_ONLY)
endif(WIN32) endif(WIN32)
file(GLOB XdmfHeaders "*.hpp" "*.tpp" "*.i" "CMake/VersionSuite/*.hpp") file(GLOB XdmfHeaders "*.hpp" "*.tpp" "*.i" "CMake/VersionSuite/*.hpp")
install(FILES ${XdmfHeaders} DESTINATION include) install(FILES ${XdmfHeaders} DESTINATION include)
install(TARGETS Xdmf install(TARGETS Xdmf
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
LIBRARY DESTINATION lib LIBRARY DESTINATION lib
...@@ -252,5 +252,4 @@ if(NOT XDMF_BUILD_CORE_ONLY) ...@@ -252,5 +252,4 @@ if(NOT XDMF_BUILD_CORE_ONLY)
endif(NOT XDMF_BUILD_CORE_ONLY) endif(NOT XDMF_BUILD_CORE_ONLY)
xdmf_create_config_file(${PROJECT_NAME}) xdmf_create_config_file(${PROJECT_NAME})
file(COPY "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" DESTINATION ${CMAKE_INSTALL_PREFIX} install(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" DESTINATION ${CMAKE_INSTALL_PREFIX})
FILE_PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ )
...@@ -145,6 +145,3 @@ set(XDMF_BINARIES ${XDMF_BINARIES} ${CMAKE_INSTALL_PREFIX}/bin) ...@@ -145,6 +145,3 @@ set(XDMF_BINARIES ${XDMF_BINARIES} ${CMAKE_INSTALL_PREFIX}/bin)
set(XDMF_LIBRARY_CONFIG "@XDMF_LIBRARY_CONFIG@") set(XDMF_LIBRARY_CONFIG "@XDMF_LIBRARY_CONFIG@")
set(XDMF_JAVA_JAR_CONFIG "@XDMF_JAVA_JAR_CONFIG@") set(XDMF_JAVA_JAR_CONFIG "@XDMF_JAVA_JAR_CONFIG@")
set(XDMF_PYTHON_CONFIG "@XDMF_PYTHON_CONFIG@") set(XDMF_PYTHON_CONFIG "@XDMF_PYTHON_CONFIG@")
configure_file(${CMAKE_SOURCE_DIR}/XdmfConfig.cmake.in
${CMAKE_BINARY_DIR}/XdmfConfig.cmake.in @ONLY)
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