diff --git a/CppParser/CMakeLists.txt b/CppParser/CMakeLists.txt
index 3423906c8a..fe52d3a42d 100644
--- a/CppParser/CMakeLists.txt
+++ b/CppParser/CMakeLists.txt
@@ -26,24 +26,10 @@ target_include_directories( "${LIBNAME}"
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
 
-install(
-    DIRECTORY include/Poco
-    DESTINATION include
-    COMPONENT Devel
-    PATTERN ".svn" EXCLUDE
-    )
-
-install(
-    TARGETS "${LIBNAME}" EXPORT "${LIBNAME}Targets"
-    LIBRARY DESTINATION lib${LIB_SUFFIX}
-    ARCHIVE DESTINATION lib${LIB_SUFFIX}
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include
-    )
-
-POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
+POCO_INSTALL("${LIBNAME}")
+POCO_GENERATE_PACKAGE("${LIBNAME}")
 
 if (ENABLE_TESTS)
-  add_subdirectory(testsuite)
+    add_subdirectory(testsuite)
 endif ()
 
diff --git a/Crypto/CMakeLists.txt b/Crypto/CMakeLists.txt
index 507c573e93..7f4c2621b7 100644
--- a/Crypto/CMakeLists.txt
+++ b/Crypto/CMakeLists.txt
@@ -27,24 +27,11 @@ target_include_directories( "${LIBNAME}"
         $<INSTALL_INTERFACE:include>
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
-install(
-    DIRECTORY include/Poco
-    DESTINATION include
-    COMPONENT Devel
-    PATTERN ".svn" EXCLUDE
-    )
-
-install(
-    TARGETS "${LIBNAME}" EXPORT "${LIBNAME}Targets"
-    LIBRARY DESTINATION lib${LIB_SUFFIX}
-    ARCHIVE DESTINATION lib${LIB_SUFFIX}
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include
-    )
 
-POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
+POCO_INSTALL("${LIBNAME}")
+POCO_GENERATE_PACKAGE("${LIBNAME}")
 
 if (ENABLE_TESTS)
-  add_subdirectory(samples)
-  add_subdirectory(testsuite)
+    add_subdirectory(samples)
+    add_subdirectory(testsuite)
 endif ()
diff --git a/Data/CMakeLists.txt b/Data/CMakeLists.txt
index b70c1075c7..e96cf3eb5e 100644
--- a/Data/CMakeLists.txt
+++ b/Data/CMakeLists.txt
@@ -34,54 +34,41 @@ target_include_directories( "${LIBNAME}"
         $<INSTALL_INTERFACE:include>
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
-install(
-    DIRECTORY include/Poco
-    DESTINATION include
-    COMPONENT Devel
-    PATTERN ".svn" EXCLUDE
-    )
-
-install(
-    TARGETS "${LIBNAME}" EXPORT "${LIBNAME}Targets"
-    LIBRARY DESTINATION lib${LIB_SUFFIX}
-    ARCHIVE DESTINATION lib${LIB_SUFFIX}
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include
-    )
 
-POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
+POCO_INSTALL("${LIBNAME}")
+POCO_GENERATE_PACKAGE("${LIBNAME}")
 
 if(ENABLE_DATA_SQLITE)
-# SQlite3 is built in any case
-add_subdirectory( SQLite )
+    # SQlite3 is built in any case
+    add_subdirectory( SQLite )
 endif(ENABLE_DATA_SQLITE)
 
 if(ENABLE_DATA_MYSQL)
-find_package(MySQL)
-if(MYSQL_FOUND)
-    include_directories("${MYSQL_INCLUDE_DIR}")
-    message(STATUS "MySQL Support Enabled")
-    add_subdirectory( MySQL )
-else()
-    message(STATUS "MySQL Support Disabled - no MySQL library")
-endif(MYSQL_FOUND)
+    find_package(MySQL)
+    if(MYSQL_FOUND)
+        include_directories("${MYSQL_INCLUDE_DIR}")
+        message(STATUS "MySQL Support Enabled")
+        add_subdirectory( MySQL )
+    else()
+        message(STATUS "MySQL Support Disabled - no MySQL library")
+    endif(MYSQL_FOUND)
 endif(ENABLE_DATA_MYSQL)
 
 if(ENABLE_DATA_ODBC)
-find_package(ODBC)
-if(WIN32 AND NOT WINCE)
-    set(ODBC_LIBRARIES "odbc32" "odbccp32")
-    message(STATUS "Windows native ODBC Support Enabled")
-    add_subdirectory( ODBC )
-else(WIN32 AND NOT WINCE)
-    if(ODBC_FOUND)
-        include_directories("${ODBC_INCLUDE_DIRECTORIES}")
-        message(STATUS "ODBC Support Enabled")
+    find_package(ODBC)
+    if(WIN32 AND NOT WINCE)
+        set(ODBC_LIBRARIES "odbc32" "odbccp32")
+        message(STATUS "Windows native ODBC Support Enabled")
         add_subdirectory( ODBC )
-    else()
-        message(STATUS "ODBC Support Disabled - no ODBC runtime")
-    endif()
-endif(WIN32 AND NOT WINCE)
+    else(WIN32 AND NOT WINCE)
+        if(ODBC_FOUND)
+            include_directories("${ODBC_INCLUDE_DIRECTORIES}")
+            message(STATUS "ODBC Support Enabled")
+            add_subdirectory( ODBC )
+        else()
+            message(STATUS "ODBC Support Disabled - no ODBC runtime")
+        endif()
+    endif(WIN32 AND NOT WINCE)
 endif(ENABLE_DATA_ODBC)
 
 if (ENABLE_TESTS)
diff --git a/Data/MySQL/CMakeLists.txt b/Data/MySQL/CMakeLists.txt
index 87a5721686..254135be55 100644
--- a/Data/MySQL/CMakeLists.txt
+++ b/Data/MySQL/CMakeLists.txt
@@ -27,22 +27,9 @@ target_include_directories( "${LIBNAME}"
         $<INSTALL_INTERFACE:include>
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
-install(
-    DIRECTORY include/Poco
-    DESTINATION include
-    COMPONENT Devel
-    PATTERN ".svn" EXCLUDE
-    )
-
-install(
-    TARGETS "${LIBNAME}" EXPORT "${LIBNAME}Targets"
-    LIBRARY DESTINATION lib${LIB_SUFFIX}
-    ARCHIVE DESTINATION lib${LIB_SUFFIX}
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include
-    )
 
-POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
+POCO_INSTALL("${LIBNAME}")
+POCO_GENERATE_PACKAGE("${LIBNAME}")
 
 if (ENABLE_TESTS)
     add_subdirectory(testsuite)
diff --git a/Data/ODBC/CMakeLists.txt b/Data/ODBC/CMakeLists.txt
index 007dc8661e..eb29288a81 100644
--- a/Data/ODBC/CMakeLists.txt
+++ b/Data/ODBC/CMakeLists.txt
@@ -27,22 +27,9 @@ target_include_directories( "${LIBNAME}"
         $<INSTALL_INTERFACE:include>
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
-install(
-    DIRECTORY include/Poco
-    DESTINATION include
-    COMPONENT Devel
-    PATTERN ".svn" EXCLUDE
-    )
-
-install(
-    TARGETS "${LIBNAME}" EXPORT "${LIBNAME}Targets"
-    LIBRARY DESTINATION lib${LIB_SUFFIX}
-    ARCHIVE DESTINATION lib${LIB_SUFFIX}
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include
-    )
 
-POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
+POCO_INSTALL("${LIBNAME}")
+POCO_GENERATE_PACKAGE("${LIBNAME}")
 
 if (ENABLE_TESTS)
     add_subdirectory(testsuite)
diff --git a/Data/SQLite/CMakeLists.txt b/Data/SQLite/CMakeLists.txt
index 559303f248..a7a5bf5748 100644
--- a/Data/SQLite/CMakeLists.txt
+++ b/Data/SQLite/CMakeLists.txt
@@ -48,22 +48,9 @@ target_include_directories( "${LIBNAME}"
         $<INSTALL_INTERFACE:include>
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
-install(
-    DIRECTORY include/Poco
-    DESTINATION include
-    COMPONENT Devel
-    PATTERN ".svn" EXCLUDE
-    )
-
-install(
-    TARGETS "${LIBNAME}" EXPORT "${LIBNAME}Targets"
-    LIBRARY DESTINATION lib${LIB_SUFFIX}
-    ARCHIVE DESTINATION lib${LIB_SUFFIX}
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include
-    )
 
-POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
+POCO_INSTALL("${LIBNAME}")
+POCO_GENERATE_PACKAGE("${LIBNAME}")
 
 if (ENABLE_TESTS)
     add_subdirectory(testsuite)
diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt
index 8d677cc17e..c1dd25ff49 100644
--- a/Foundation/CMakeLists.txt
+++ b/Foundation/CMakeLists.txt
@@ -121,22 +121,8 @@ target_include_directories( "${LIBNAME}"
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
 
-install(
-    DIRECTORY include/Poco
-    DESTINATION include
-    COMPONENT Devel
-    PATTERN ".svn" EXCLUDE
-    )
-
-install(
-    TARGETS "${LIBNAME}" EXPORT "${LIBNAME}Targets"
-    LIBRARY DESTINATION lib${LIB_SUFFIX}
-    ARCHIVE DESTINATION lib${LIB_SUFFIX}
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include
-    )
-
-POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
+POCO_INSTALL("${LIBNAME}")
+POCO_GENERATE_PACKAGE("${LIBNAME}")
 
 if (ENABLE_TESTS)
     add_subdirectory( samples )
diff --git a/JSON/CMakeLists.txt b/JSON/CMakeLists.txt
index 7e314a0cc2..e5746a6287 100644
--- a/JSON/CMakeLists.txt
+++ b/JSON/CMakeLists.txt
@@ -26,25 +26,11 @@ target_include_directories( "${LIBNAME}"
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
 
-install(
-    DIRECTORY include/Poco
-    DESTINATION include
-    COMPONENT Devel
-    PATTERN ".svn" EXCLUDE
-    )
-
-install(
-    TARGETS "${LIBNAME}" EXPORT "${LIBNAME}Targets"
-    LIBRARY DESTINATION lib${LIB_SUFFIX}
-    ARCHIVE DESTINATION lib${LIB_SUFFIX}
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include
-    )
-
-POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
+POCO_INSTALL("${LIBNAME}")
+POCO_GENERATE_PACKAGE("${LIBNAME}")
 
 if (ENABLE_TESTS)
-  add_subdirectory(samples)
-  add_subdirectory(testsuite)
+    add_subdirectory(samples)
+    add_subdirectory(testsuite)
 endif ()
 
diff --git a/MongoDB/CMakeLists.txt b/MongoDB/CMakeLists.txt
index 03e1fbcb9b..5b95e6254b 100644
--- a/MongoDB/CMakeLists.txt
+++ b/MongoDB/CMakeLists.txt
@@ -25,25 +25,12 @@ target_include_directories( "${LIBNAME}"
         $<INSTALL_INTERFACE:include>
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
-install(
-    DIRECTORY include/Poco
-    DESTINATION include
-    COMPONENT Devel
-    PATTERN ".svn" EXCLUDE
-    )
-
-install(
-    TARGETS "${LIBNAME}" EXPORT "${LIBNAME}Targets"
-    LIBRARY DESTINATION lib${LIB_SUFFIX}
-    ARCHIVE DESTINATION lib${LIB_SUFFIX}
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include
-    )
 
-POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
+POCO_INSTALL("${LIBNAME}")
+POCO_GENERATE_PACKAGE("${LIBNAME}")
 
 if (ENABLE_TESTS)
-  add_subdirectory(samples)
-  add_subdirectory(testsuite)
+    add_subdirectory(samples)
+    add_subdirectory(testsuite)
 endif ()
 
diff --git a/Net/CMakeLists.txt b/Net/CMakeLists.txt
index 3a3969dc1b..af19c0487f 100644
--- a/Net/CMakeLists.txt
+++ b/Net/CMakeLists.txt
@@ -34,25 +34,12 @@ target_include_directories( "${LIBNAME}"
         $<INSTALL_INTERFACE:include>
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
-install(
-    DIRECTORY include/Poco
-    DESTINATION include
-    COMPONENT Devel
-    PATTERN ".svn" EXCLUDE
-    )
-
-install(
-    TARGETS "${LIBNAME}" EXPORT "${LIBNAME}Targets"
-    LIBRARY DESTINATION lib${LIB_SUFFIX}
-    ARCHIVE DESTINATION lib${LIB_SUFFIX}
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include
-    )
 
-POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
+POCO_INSTALL("${LIBNAME}")
+POCO_GENERATE_PACKAGE("${LIBNAME}")
 
 if (ENABLE_TESTS)
-  add_subdirectory(samples)
-  add_subdirectory(testsuite)
+    add_subdirectory(samples)
+    add_subdirectory(testsuite)
 endif ()
 
diff --git a/NetSSL_OpenSSL/CMakeLists.txt b/NetSSL_OpenSSL/CMakeLists.txt
index 0ad6a67f15..f6a40c68df 100644
--- a/NetSSL_OpenSSL/CMakeLists.txt
+++ b/NetSSL_OpenSSL/CMakeLists.txt
@@ -25,25 +25,12 @@ target_include_directories( "${LIBNAME}"
         $<INSTALL_INTERFACE:include>
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
-install(
-    DIRECTORY include/Poco
-    DESTINATION include
-    COMPONENT Devel
-    PATTERN ".svn" EXCLUDE
-    )
-
-install(
-    TARGETS "${LIBNAME}" EXPORT "${LIBNAME}Targets"
-    LIBRARY DESTINATION lib${LIB_SUFFIX}
-    ARCHIVE DESTINATION lib${LIB_SUFFIX}
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include
-    )
 
-POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
+POCO_INSTALL("${LIBNAME}")
+POCO_GENERATE_PACKAGE("${LIBNAME}")
 
 if (ENABLE_TESTS)
-  add_subdirectory(samples)
-  add_subdirectory(testsuite)
+    add_subdirectory(samples)
+    add_subdirectory(testsuite)
 endif ()
 
diff --git a/NetSSL_Win/CMakeLists.txt b/NetSSL_Win/CMakeLists.txt
index c5b41de633..355f49bafb 100644
--- a/NetSSL_Win/CMakeLists.txt
+++ b/NetSSL_Win/CMakeLists.txt
@@ -25,26 +25,13 @@ target_include_directories( "${LIBNAME}"
         $<INSTALL_INTERFACE:include>
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
-install(
-    DIRECTORY include/Poco
-    DESTINATION include
-    COMPONENT Devel
-    PATTERN ".svn" EXCLUDE
-    )
-
-install(
-    TARGETS "${LIBNAME}" EXPORT "${LIBNAME}Targets"
-    LIBRARY DESTINATION lib${LIB_SUFFIX}
-    ARCHIVE DESTINATION lib${LIB_SUFFIX}
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include
-    )
 
-POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
+POCO_INSTALL("${LIBNAME}")
+POCO_GENERATE_PACKAGE("${LIBNAME}")
 
 if (ENABLE_TESTS)
-  #TODO: Looks like the samples use crypto somehow?
-  #add_subdirectory(samples)
-  #add_subdirectory(testsuite)
+    #TODO: Looks like the samples use crypto somehow?
+    #add_subdirectory(samples)
+    #add_subdirectory(testsuite)
 endif ()
 
diff --git a/PDF/CMakeLists.txt b/PDF/CMakeLists.txt
index fbca899404..46f538d774 100644
--- a/PDF/CMakeLists.txt
+++ b/PDF/CMakeLists.txt
@@ -130,25 +130,12 @@ target_include_directories( "${LIBNAME}"
         $<INSTALL_INTERFACE:include>
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
-install(
-    DIRECTORY include/Poco
-    DESTINATION include
-    COMPONENT Devel
-    PATTERN ".svn" EXCLUDE
-    )
-
-install(
-    TARGETS "${LIBNAME}" EXPORT "${LIBNAME}Targets"
-    LIBRARY DESTINATION lib${LIB_SUFFIX}
-    ARCHIVE DESTINATION lib${LIB_SUFFIX}
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include
-    )
 
-POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
+POCO_INSTALL("${LIBNAME}")
+POCO_GENERATE_PACKAGE("${LIBNAME}")
 
 if (ENABLE_TESTS)
-  add_subdirectory(samples)
-  add_subdirectory(testsuite)
+    add_subdirectory(samples)
+    add_subdirectory(testsuite)
 endif ()
 
diff --git a/PageCompiler/CMakeLists.txt b/PageCompiler/CMakeLists.txt
index a7a60bb745..3a55c5575f 100644
--- a/PageCompiler/CMakeLists.txt
+++ b/PageCompiler/CMakeLists.txt
@@ -19,5 +19,3 @@ install(
     RUNTIME DESTINATION bin
     INCLUDES DESTINATION include
     )
-
-#POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
diff --git a/PageCompiler/File2Page/CMakeLists.txt b/PageCompiler/File2Page/CMakeLists.txt
index 9ab634dd81..cb6d9694b6 100644
--- a/PageCompiler/File2Page/CMakeLists.txt
+++ b/PageCompiler/File2Page/CMakeLists.txt
@@ -19,5 +19,3 @@ install(
     RUNTIME DESTINATION bin
     INCLUDES DESTINATION include
     )
-
-#POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
diff --git a/PocoDoc/CMakeLists.txt b/PocoDoc/CMakeLists.txt
index 80e49d39d8..824168c08c 100644
--- a/PocoDoc/CMakeLists.txt
+++ b/PocoDoc/CMakeLists.txt
@@ -15,5 +15,3 @@ install(
     RUNTIME DESTINATION bin
     INCLUDES DESTINATION include
     )
-
-#POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
diff --git a/SevenZip/CMakeLists.txt b/SevenZip/CMakeLists.txt
index bcc35dfd0f..bf76be3247 100644
--- a/SevenZip/CMakeLists.txt
+++ b/SevenZip/CMakeLists.txt
@@ -66,26 +66,13 @@ target_include_directories( "${LIBNAME}"
         $<INSTALL_INTERFACE:include>
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
-install(
-    DIRECTORY include/Poco
-    DESTINATION include
-    COMPONENT Devel
-    PATTERN ".svn" EXCLUDE
-    )
-
-install(
-    TARGETS "${LIBNAME}" EXPORT "${LIBNAME}Targets"
-    LIBRARY DESTINATION lib${LIB_SUFFIX}
-    ARCHIVE DESTINATION lib${LIB_SUFFIX}
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include
-    )
 
-POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
+POCO_INSTALL("${LIBNAME}")
+POCO_GENERATE_PACKAGE("${LIBNAME}")
 
 if (ENABLE_TESTS)
-  add_subdirectory(samples)
-  # TODO: Add tests
-  #add_subdirectory(testsuite)
+    add_subdirectory(samples)
+    # TODO: Add tests
+    #add_subdirectory(testsuite)
 endif ()
 
diff --git a/Util/CMakeLists.txt b/Util/CMakeLists.txt
index a8dd686613..8525192274 100644
--- a/Util/CMakeLists.txt
+++ b/Util/CMakeLists.txt
@@ -32,22 +32,8 @@ target_include_directories( "${LIBNAME}"
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
 
-install(
-    DIRECTORY include/Poco
-    DESTINATION include
-    COMPONENT Devel
-    PATTERN ".svn" EXCLUDE
-    )
-
-install(
-    TARGETS "${LIBNAME}" EXPORT "${LIBNAME}Targets"
-    LIBRARY DESTINATION lib${LIB_SUFFIX}
-    ARCHIVE DESTINATION lib${LIB_SUFFIX}
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include
-    )
-
-POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
+POCO_INSTALL("${LIBNAME}")
+POCO_GENERATE_PACKAGE("${LIBNAME}")
 
 if (ENABLE_TESTS)
     add_subdirectory(samples)
diff --git a/XML/CMakeLists.txt b/XML/CMakeLists.txt
index 17c0a37cd6..21e57f8255 100644
--- a/XML/CMakeLists.txt
+++ b/XML/CMakeLists.txt
@@ -49,25 +49,11 @@ target_include_directories( "${LIBNAME}"
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
 
-install(
-    DIRECTORY include/Poco
-    DESTINATION include
-    COMPONENT Devel
-    PATTERN ".svn" EXCLUDE
-    )
-
-install(
-    TARGETS "${LIBNAME}" EXPORT "${LIBNAME}Targets"
-    LIBRARY DESTINATION lib${LIB_SUFFIX}
-    ARCHIVE DESTINATION lib${LIB_SUFFIX}
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include
-    )
-
-POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
+POCO_INSTALL("${LIBNAME}")
+POCO_GENERATE_PACKAGE("${LIBNAME}")
 
 if (ENABLE_TESTS)
-  add_subdirectory(samples)
-  add_subdirectory(testsuite)
+    add_subdirectory(samples)
+    add_subdirectory(testsuite)
 endif ()
 
diff --git a/Zip/CMakeLists.txt b/Zip/CMakeLists.txt
index 1937e91e40..1263d283da 100644
--- a/Zip/CMakeLists.txt
+++ b/Zip/CMakeLists.txt
@@ -25,25 +25,12 @@ target_include_directories( "${LIBNAME}"
         $<INSTALL_INTERFACE:include>
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
-install(
-    DIRECTORY include/Poco
-    DESTINATION include
-    COMPONENT Devel
-    PATTERN ".svn" EXCLUDE
-    )
-
-install(
-    TARGETS "${LIBNAME}" EXPORT "${LIBNAME}Targets"
-    LIBRARY DESTINATION lib${LIB_SUFFIX}
-    ARCHIVE DESTINATION lib${LIB_SUFFIX}
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include
-    )
 
-POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
+POCO_INSTALL("${LIBNAME}")
+POCO_GENERATE_PACKAGE("${LIBNAME}")
 
 if (ENABLE_TESTS)
-  add_subdirectory(samples)
-  add_subdirectory(testsuite)
+    add_subdirectory(samples)
+    add_subdirectory(testsuite)
 endif ()
 
diff --git a/cmake/PocoConfig.cmake b/cmake/PocoConfig.cmake
deleted file mode 100644
index 0ce51e690c..0000000000
--- a/cmake/PocoConfig.cmake
+++ /dev/null
@@ -1,143 +0,0 @@
-# - Find the Poco includes and libraries.
-# The following variables are set if Poco is found.  If Poco is not
-# found, Poco_FOUND is set to false.
-#  Poco_FOUND        - True when the Poco include directory is found.
-#  Poco_INCLUDE_DIRS - the path to where the poco include files are.
-#  Poco_LIBRARY_DIRS - The path to where the poco library files are.
-#  Poco_BINARY_DIRS - The path to where the poco dlls are.
-
-# ----------------------------------------------------------------------------
-# If you have installed Poco in a non-standard location.
-# Then you have three options. 
-# In the following comments, it is assumed that <Your Path>
-# points to the root directory of the include directory of Poco. e.g
-# If you have put poco in C:\development\Poco then <Your Path> is
-# "C:/development/Poco" and in this directory there will be two
-# directories called "include" and "lib".
-# 1) After CMake runs, set Poco_INCLUDE_DIR to <Your Path>/poco<-version>
-# 2) Use CMAKE_INCLUDE_PATH to set a path to <Your Path>/poco<-version>. This will allow FIND_PATH()
-#    to locate Poco_INCLUDE_DIR by utilizing the PATH_SUFFIXES option. e.g.
-#    SET(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} "<Your Path>/include")
-# 3) Set an environment variable called ${POCO_ROOT} that points to the root of where you have
-#    installed Poco, e.g. <Your Path>. It is assumed that there is at least a subdirectory called
-#    Foundation/include/Poco in this path.
-#
-# Note:
-#  1) If you are just using the poco headers, then you do not need to use
-#     Poco_LIBRARY_DIRS in your CMakeLists.txt file.
-#  2) If Poco has not been installed, then when setting Poco_LIBRARY_DIRS
-#     the script will look for /lib first and, if this fails, then for /stage/lib.
-#
-# Usage:
-# In your CMakeLists.txt file do something like this:
-# ...
-# # Poco
-# FIND_PACKAGE(Poco)
-# ...
-# INCLUDE_DIRECTORIES(${Poco_INCLUDE_DIRS})
-# LINK_DIRECTORIES(${Poco_LIBRARY_DIRS})
-#
-# In Windows, we make the assumption that, if the Poco files are installed, the default directory
-# will be C:\poco or C:\Program Files\Poco.
-
-SET(POCO_INCLUDE_PATH_DESCRIPTION "top-level directory containing the poco include directories. E.g /usr/local/include/poco-1.2.1 or c:\\poco\\include\\poco-1.2.1")
-SET(POCO_INCLUDE_DIR_MESSAGE "Set the Poco_INCLUDE_DIR cmake cache entry to the ${POCO_INCLUDE_PATH_DESCRIPTION}")
-SET(POCO_LIBRARY_PATH_DESCRIPTION "top-level directory containing the poco libraries.")
-SET(POCO_LIBRARY_DIR_MESSAGE "Set the Poco_LIBRARY_DIR cmake cache entry to the ${POCO_LIBRARY_PATH_DESCRIPTION}")
-
-
-SET(POCO_DIR_SEARCH $ENV{POCO_ROOT})
-IF(POCO_DIR_SEARCH)
-  FILE(TO_CMAKE_PATH ${POCO_DIR_SEARCH} POCO_DIR_SEARCH)
-ENDIF(POCO_DIR_SEARCH)
-
-
-IF(WIN32)
-  SET(POCO_DIR_SEARCH
-    ${POCO_DIR_SEARCH}
-    C:/poco
-    D:/poco
-    "C:Program Files/poco"
-    "D:Program Files/poco"
-  )
-ENDIF(WIN32)
-
-# Add in some path suffixes. These will have to be updated whenever a new Poco version comes out.
-SET(SUFFIX_FOR_INCLUDE_PATH
- poco-1.2.4
- poco-1.2.3
- poco-1.2.1
-)
-
-SET(SUFFIX_FOR_LIBRARY_PATH
- poco-1.2.4/lib
- poco-1.2.4/lib/Linux/i686
- poco-1.2.3/lib
- poco-1.2.3/lib/Linux/i686
- poco-1.2.1/lib
- poco-1.2.1/lib/Linux/i686
- lib
- lib/Linux/i686
-)
-
-#
-# Look for an installation.
-#
-FIND_PATH(Poco_INCLUDE_DIR NAMES Foundation/include/Poco/AbstractCache.h PATH_SUFFIXES ${SUFFIX_FOR_INCLUDE_PATH} PATHS
-
-  # Look in other places.
-  ${POCO_DIR_SEARCH}
-
-  # Help the user find it if we cannot.
-  DOC "The ${POCO_INCLUDE_DIR_MESSAGE}"
-)
-
-# Assume we didn't find it.
-SET(Poco_FOUND 0)
-
-# Now try to get the include and library path.
-IF(Poco_INCLUDE_DIR)
-
-  IF(EXISTS "${Poco_INCLUDE_DIR}")
-    SET(Poco_INCLUDE_DIRS
-      ${Poco_INCLUDE_DIR}/CppUnit/include
-      ${Poco_INCLUDE_DIR}/Foundation/include
-      ${Poco_INCLUDE_DIR}/Net/include
-      ${Poco_INCLUDE_DIR}/Util/include
-      ${Poco_INCLUDE_DIR}/XML/include
-    )
-    SET(Poco_FOUND 1)
-  ENDIF(EXISTS "${Poco_INCLUDE_DIR}")
-
-  FIND_LIBRARY(Poco_LIBRARY_DIR NAMES PocoFoundation PocoFoundationd  PATH_SUFFIXES ${SUFFIX_FOR_LIBRARY_PATH} PATHS
-
-    # Look in other places.
-    ${Poco_INCLUDE_DIR}
-    ${POCO_DIR_SEARCH}
-
-    # Help the user find it if we cannot.
-    DOC "The ${POCO_LIBRARY_PATH_DESCRIPTION}"
-  )
-  GET_FILENAME_COMPONENT(Poco_LIBRARY_DIR ${Poco_LIBRARY_DIR} PATH)
-  IF(Poco_INCLUDE_DIR)
-    SET(Poco_LIBRARY_DIRS ${Poco_LIBRARY_DIR})
-
-    # Look for the poco binary path.
-    SET(Poco_BINARY_DIR ${Poco_INCLUDE_DIR})
-    IF(Poco_BINARY_DIR AND EXISTS "${Poco_BINARY_DIR}")
-      SET(Poco_BINARY_DIRS ${Poco_BINARY_DIR}/bin)
-    ENDIF(Poco_BINARY_DIR AND EXISTS "${Poco_BINARY_DIR}")
-  ENDIF(Poco_INCLUDE_DIR)
-
-ENDIF(Poco_INCLUDE_DIR)
-
-IF(NOT Poco_FOUND)
-  IF(NOT Poco_FIND_QUIETLY)
-    MESSAGE(STATUS "Poco was not found. ${POCO_DIR_MESSAGE}")
-  ELSE(NOT Poco_FIND_QUIETLY)
-    IF(Poco_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Poco was not found. ${POCO_DIR_MESSAGE}")
-    ENDIF(Poco_FIND_REQUIRED)
-  ENDIF(NOT Poco_FIND_QUIETLY)
-ENDIF(NOT Poco_FOUND)
-
diff --git a/cmake/PocoMacros.cmake b/cmake/PocoMacros.cmake
index f255c502af..95e09201bd 100644
--- a/cmake/PocoMacros.cmake
+++ b/cmake/PocoMacros.cmake
@@ -187,46 +187,67 @@ endmacro()
 #===============================================================================
 # Macros for Package generation
 #
-#TODO: Document this!
 #  POCO_GENERATE_PACKAGE - Generates *Config.cmake
-#    Usage: POCO_SOURCES_PLAT( out name platform sources)
+#    Usage: POCO_GENERATE_PACKAGE(target_name)
 #      INPUT:
-#           out             the variable the sources are added to
-#           name:           the name of the components
-#           platform:       the platform this sources are for (ON = All, OFF = None, WIN32, UNIX ...)
-#           sources:        a list of files to add to ${out}
-#    Example: POCO_SOURCES_PLAT( SRCS Foundation ON src/Foundation.cpp )
-macro(POCO_GENERATE_PACKAGE target_name export_name package_destination)
+#           target_name             the name of the target. e.g. Foundation for PocoFoundation
+#    Example: POCO_GENERATE_PACKAGE(Foundation)
+macro(POCO_GENERATE_PACKAGE target_name)
 include(CMakePackageConfigHelpers)
 write_basic_package_version_file(
   "${CMAKE_CURRENT_BINARY_DIR}/Poco${target_name}ConfigVersion.cmake"
   VERSION ${PROJECT_VERSION}
   COMPATIBILITY AnyNewerVersion
 )
-export(EXPORT "${export_name}"
-  FILE "${CMAKE_CURRENT_BINARY_DIR}/Poco${target_name}Targets.cmake"
-  NAMESPACE "Poco::"
+export(EXPORT "${target_name}Targets"
+  FILE "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}Targets.cmake"
+  NAMESPACE "${PROJECT_NAME}::"
 )
-configure_file(cmake/Poco${target_name}Config.cmake
-  "${CMAKE_CURRENT_BINARY_DIR}/Poco${target_name}Config.cmake"
+configure_file("cmake/Poco${target_name}Config.cmake"
+  "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}Config.cmake"
   @ONLY
 )
 
-set(ConfigPackageLocation "${package_destination}")
+set(ConfigPackageLocation "lib/cmake/${PROJECT_NAME}")
 
 install(
-    EXPORT "${export_name}"
-    FILE "Poco${target_name}Targets.cmake"
-    NAMESPACE "Poco::"
-    DESTINATION ${package_destination}
+    EXPORT "${target_name}Targets"
+    FILE "${PROJECT_NAME}${target_name}Targets.cmake"
+    NAMESPACE "${PROJECT_NAME}::"
+    DESTINATION "lib/cmake/${PROJECT_NAME}"
     )
 
 install(
     FILES
-        "${CMAKE_CURRENT_BINARY_DIR}/Poco${target_name}Config.cmake"
-        "${CMAKE_CURRENT_BINARY_DIR}/Poco${target_name}ConfigVersion.cmake"
-    DESTINATION ${package_destination}
+        "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}Config.cmake"
+        "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}ConfigVersion.cmake"
+    DESTINATION "lib/cmake/${PROJECT_NAME}"
     COMPONENT Devel
     )
 
 endmacro()
+
+#===============================================================================
+# Macros for simplified installation
+#
+#  POCO_INSTALL - Install the given target
+#    Usage: POCO_INSTALL(target_name)
+#      INPUT:
+#           target_name             the name of the target. e.g. Foundation for PocoFoundation
+#    Example: POCO_INSTALL(Foundation)
+macro(POCO_INSTALL target_name)
+install(
+    DIRECTORY include/Poco
+    DESTINATION include
+    COMPONENT Devel
+    PATTERN ".svn" EXCLUDE
+    )
+
+install(
+    TARGETS "${target_name}" EXPORT "${target_name}Targets"
+    LIBRARY DESTINATION lib${LIB_SUFFIX}
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}
+    RUNTIME DESTINATION bin
+    INCLUDES DESTINATION include
+    )
+endmacro()