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

tfussell · Jan 2, 2021 · 3127e9c · 3127e9c
2 parents 319c419 + 3c7122a
commit 3127e9c
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
@@ -256,6 +256,9 @@ install(EXPORT XlntTargets
 include(CMakePackageConfigHelpers)
 
 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
 configure_package_config_file(../cmake/XlntConfig.cmake.in