X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=CMake%2FInstallPublicHeaders.cmake;h=ae2fa711c53be2d26ab1a71f177778d09456747a;hb=refs%2Ftags%2F1.1.0-beta1;hp=70cfe3d02c092864373daf4d63ce1076e11681ed;hpb=0eb039e8de2a95b35a082a21a103a68e1d08385f;p=awesomized%2Flibmemcached

diff --git a/CMake/InstallPublicHeaders.cmake b/CMake/InstallPublicHeaders.cmake
index 70cfe3d0..ae2fa711 100644
--- a/CMake/InstallPublicHeaders.cmake
+++ b/CMake/InstallPublicHeaders.cmake
@@ -23,21 +23,21 @@ function(install_public_headers DIRECTORY)
         string(TOUPPER ${LIBRARY} LIBRARY_UCASE)
         math(EXPR DASH "${DASH} + 1")
         string(SUBSTRING ${TOP} ${DASH} -1 VERSION)
-        if(NOT ${LIBRARY_UCASE}_VERSION_INC VERSION_EQUAL ${VERSION})
-            message(SEND_ERROR "${LIBRARY} public include directory version ${VERSION} != " ${${LIBRARY_UCASE}_VERSION_INC})
+        if(NOT ${LIBRARY_UCASE}_VERSION_MAJOR VERSION_EQUAL ${VERSION})
+            message(SEND_ERROR "${LIBRARY} public include directory version ${VERSION} != " ${${LIBRARY_UCASE}_VERSION_MAJOR})
             set(ENV{INVALID_CONFIGURATION} 1)
         endif()
     endif()
 
     # change local includes to system includes
     foreach(HEADER IN LISTS ARGN)
-        file(READ ${HEADER} HEADER_IN)
-        string(REGEX REPLACE "include *\"([^\"]+)\"" "include <\\1>" HEADER_OUT "${HEADER_IN}")
-        file(GENERATE
-                OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${HEADER}
-                CONTENT "${HEADER_OUT}"
-                )
-        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HEADER}
+        if(HEADER MATCHES "^@")
+            string(SUBSTRING ${HEADER} 1 -1 HEADER)
+            configure_file(${HEADER}.in ${HEADER})
+            set(HEADER "${CMAKE_CURRENT_BINARY_DIR}/${HEADER}")
+        endif()
+        install(FILES ${HEADER}
+                COMPONENT dev
                 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${DIRECTORY}
                 )
     endforeach()