diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4418fe9..0c0b9c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,37 +58,43 @@ target_include_directories(subsys INTERFACE
   $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
   $<INSTALL_INTERFACE:include>
 )
-xo_install_library(subsys)
+xo_install_library2(subsys)
 
 # ----------------------------------------------------------------
-# cmake export
-# (so this library works with cmake's find_package())
+# provide find_package() support
 
-set(XO_PROJECT_CONFIG_VERSION "${XO_PROJECT_NAME}ConfigVersion.cmake")
-set(XO_PROJECT_CONFIG "${XO_PROJECT_NAME}Config.cmake")
+xo_export_cmake_config(${PROJECT_NAME} ${PROJECT_VERSION} ${PROJECT_NAME}Targets)
 
-include(CMakePackageConfigHelpers)
-write_basic_package_version_file("${PROJECT_BINARY_DIR}/${XO_PROJECT_CONFIG_VERSION}"
-    VERSION 0.1
-    COMPATIBILITY AnyNewerVersion
-)
-
-configure_package_config_file(
-    "${PROJECT_SOURCE_DIR}/cmake/${XO_PROJECT_NAME}Config.cmake.in"
-    "${PROJECT_BINARY_DIR}/${XO_PROJECT_CONFIG}"
-    INSTALL_DESTINATION lib/cmake/${XO_PROJECT_NAME}
-    )
-
-install(EXPORT ${XO_PROJECT_NAME}Targets DESTINATION lib/cmake/${XO_PROJECT_NAME})
-install(
-    FILES
-    "${PROJECT_BINARY_DIR}/${XO_PROJECT_CONFIG_VERSION}"
-    "${PROJECT_BINARY_DIR}/${XO_PROJECT_CONFIG}"
-    DESTINATION lib/cmake/${XO_PROJECT_NAME})
+## ----------------------------------------------------------------
+## cmake export
+## (so this library works with cmake's find_package())
+#
+#set(XO_PROJECT_CONFIG_VERSION "${XO_PROJECT_NAME}ConfigVersion.cmake")
+#set(XO_PROJECT_CONFIG "${XO_PROJECT_NAME}Config.cmake")
+#
+#include(CMakePackageConfigHelpers)
+#write_basic_package_version_file("${PROJECT_BINARY_DIR}/${XO_PROJECT_CONFIG_VERSION}"
+#    VERSION 0.1
+#    COMPATIBILITY AnyNewerVersion
+#)
+#
+#configure_package_config_file(
+#    "${PROJECT_SOURCE_DIR}/cmake/${XO_PROJECT_NAME}Config.cmake.in"
+#    "${PROJECT_BINARY_DIR}/${XO_PROJECT_CONFIG}"
+#    INSTALL_DESTINATION lib/cmake/${XO_PROJECT_NAME}
+#    )
+#
+#install(EXPORT ${XO_PROJECT_NAME}Targets DESTINATION lib/cmake/${XO_PROJECT_NAME})
+#install(
+#    FILES
+#    "${PROJECT_BINARY_DIR}/${XO_PROJECT_CONFIG_VERSION}"
+#    "${PROJECT_BINARY_DIR}/${XO_PROJECT_CONFIG}"
+#    DESTINATION lib/cmake/${XO_PROJECT_NAME})
 
 # ----------------------------------------------------------------
 # install .hpp
 
-install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/ DESTINATION include)
+xo_install_include_tree()
+#install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/ DESTINATION include)
 
 # end CMakeLists.txt