diff --git a/CMakeLists.txt b/CMakeLists.txt
index 60500891a93888599e600be1a5b7320b55372b62..98289fd5ec66c0b55be253beaef5d4c910078951 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -282,14 +282,25 @@ set(INMOST_INSTALL_HEADERS Source/Headers/inmost.h
                            Source/Headers/inmost_block_variable.h
                            Source/Headers/container.hpp)
 
-
+#if( COMPILE_EXAMPLES )
+#list(APPEND INMOST_INSTALL_HEADERS "${PROJECT_SOURCE_DIR}/Examples/AdaptiveMesh/amesh.h")
+#message(${INMOST_INSTALL_HEADERS})
+#endif( COMPILE_EXAMPLES )
 
 include(CPack)
 export(TARGETS inmost FILE inmost-targets.cmake)
 export(PACKAGE inmost)
 set(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/Source/Headers" "${PROJECT_BINARY_DIR}")
+set(CONF_LIBRARY_DIRS "")
+if( COMPILE_EXAMPLES )
+list(APPEND CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/Examples/AdaptiveMesh")
+list(APPEND CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/Examples/GridTools")
+list(APPEND CONF_LIBRARY_DIRS "${PROJECT_BINARY_DIR}/Examples/AdaptiveMesh")
+list(APPEND CONF_LIBRARY_DIRS "${PROJECT_BINARY_DIR}/Examples/GridTools")
+endif( COMPILE_EXAMPLES )
 configure_file(inmost-config.cmake.in "${PROJECT_BINARY_DIR}/inmost-config.cmake" @ONLY)
 set(CONF_INCLUDE_DIRS "\${inmost_DIR}/include")
+set(CONF_LIBRARY_DIRS "\$")
 configure_file(inmost-config.cmake.in "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/inmost-config.cmake" @ONLY)
 configure_file(inmost-config-version.cmake.in "${PROJECT_BINARY_DIR}/inmost-config-version.cmake" @ONLY)
 
@@ -316,6 +327,12 @@ set_property(TARGET inmost PROPERTY PUBLIC_HEADER
 	"${PROJECT_SOURCE_DIR}/Source/Headers/inmost_xml.h"
 	"${PROJECT_SOURCE_DIR}/Source/Headers/container.hpp")
 
+#if( COMPILE_EXAMPLES )
+#set_property(TARGET inmost APPEND PROPERTY PUBLIC_HEADER "${PROJECT_SOURCE_DIR}/Examples/AdaptiveMesh/amesh.h")
+#get_property(PRINT_PUBLIC_HEADER TARGET inmost PROPERTY PUBLIC_HEADER)
+#message(${PRINT_PUBLIC_HEADER})
+#endif( COMPILE_EXAMPLES )
+
 install(FILES
   "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/inmost-config.cmake"
   "${PROJECT_BINARY_DIR}/inmost-config-version.cmake"
diff --git a/inmost-config.cmake.in b/inmost-config.cmake.in
index 8643cc1b5f91e55343a64ae8e17b9feb4f5a5152..b3e8bd1db40799e324edc7a50462fa0a3efd00ae 100644
--- a/inmost-config.cmake.in
+++ b/inmost-config.cmake.in
@@ -21,6 +21,7 @@ if(NOT TARGET inmost AND NOT INMOST_BINARY_DIR)
 endif()
  
 set(INMOST_LIBRARY_DIRS "${inmost_DIR}")
+list(APPEND INMOST_LIBRARY_DIRS "@CONF_LIBRARY_DIRS@")
 set(INMOST_LIBRARIES inmost)