diff --git a/CMakeLists.txt b/CMakeLists.txt
index c360483..7f7971f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,41 +53,45 @@ add_subdirectory(utest)
 # ----------------------------------------------------------------
 # cmake export
 
-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
-)
-
-#install(
-#    TARGETS ${XO_PROJECT_NAME}
-#    EXPORT ${XO_PROJECT_NAME}Targets
-#    LIBRARY DESTINATION lib COMPONENT Runtime
-#    ARCHIVE DESTINATION lib COMPONENT Development
-#    RUNTIME DESTINATION bin COMPONENT Runtime
-#    PUBLIC_HEADER DESTINATION include COMPONENT Development
-#    BUNDLE DESTINATION bin COMPONENT Runtime
+#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
+#)
+#
+##install(
+##    TARGETS ${XO_PROJECT_NAME}
+##    EXPORT ${XO_PROJECT_NAME}Targets
+##    LIBRARY DESTINATION lib COMPONENT Runtime
+##    ARCHIVE DESTINATION lib COMPONENT Development
+##    RUNTIME DESTINATION bin COMPONENT Runtime
+##    PUBLIC_HEADER DESTINATION include COMPONENT Development
+##    BUNDLE DESTINATION bin COMPONENT Runtime
+##    )
+#
+#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}
 #    )
-
-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(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
diff --git a/cmake/refcntConfig.cmake.in b/cmake/refcntConfig.cmake.in
index e13a2c5..9c15f36 100644
--- a/cmake/refcntConfig.cmake.in
+++ b/cmake/refcntConfig.cmake.in
@@ -1,4 +1,4 @@
 @PACKAGE_INIT@
 
-include("${CMAKE_CURRENT_LIST_DIR}/@XO_PROJECT_NAME@Targets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
 check_required_components("@PROJECT_NAME@")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8083cee..f58170e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,8 +7,9 @@ set_target_properties(${SELF_LIBRARY_NAME}
               VERSION ${PROJECT_VERSION}
               SOVERSION 1)
 
-xo_indentlog_dependency(${SELF_LIBRARY_NAME})
+xo_internal_dependency(${SELF_LIBRARY_NAME} indentlog)
+#xo_indentlog_dependency(${SELF_LIBRARY_NAME})
 
-xo_include_options(${SELF_LIBRARY_NAME})
+xo_include_options2(${SELF_LIBRARY_NAME})
 xo_compile_options(${SELF_LIBRARY_NAME})
 xo_install_library(${SELF_LIBRARY_NAME})