Merge branch 'master' into issue-492-stream-empty-row

This commit is contained in:
Thomas Fussell 2021-01-02 10:46:19 -05:00 committed by GitHub
commit 3127e9c016
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -256,6 +256,9 @@ install(EXPORT XlntTargets
include(CMakePackageConfigHelpers) include(CMakePackageConfigHelpers)
set(XLNT_INCLUDE_INSTALL_DIR ${XLNT_INC_DEST_DIR}) set(XLNT_INCLUDE_INSTALL_DIR ${XLNT_INC_DEST_DIR})
if(CMAKE_INSTALL_PREFIX)
set(XLNT_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/${XLNT_INCLUDE_INSTALL_DIR})
endif()
#See https://cmake.org/cmake/help/latest/module/CMakePackageConfigHelpers.html #See https://cmake.org/cmake/help/latest/module/CMakePackageConfigHelpers.html
configure_package_config_file(../cmake/XlntConfig.cmake.in configure_package_config_file(../cmake/XlntConfig.cmake.in