Index: /source/ariba/CMakeLists.txt
===================================================================
--- /source/ariba/CMakeLists.txt	(revision 10784)
+++ /source/ariba/CMakeLists.txt	(revision 10788)
@@ -138,4 +138,6 @@
 
 
+set(add_headers_INSTALL_DIR include/ariba/)
+set(add_headers_INSTALL_COMPONENT Development)
 set(add_headers_VAR libariba_HEADERS)
 set(add_sources_VAR libariba_SOURCES)
@@ -144,4 +146,5 @@
 function(add_subdir_sources_helper subdir)
     set(CURRENT_SOURCE_DIR "${CURRENT_SOURCE_DIR}${subdir}/")
+    set(add_headers_INSTALL_DIR "${add_headers_INSTALL_DIR}${subdir}/")
     add_subdirectory(${subdir})
     set(${add_headers_VAR} ${${add_headers_VAR}} PARENT_SCOPE)
@@ -161,4 +164,10 @@
         list(APPEND ${add_headers_VAR} "${CURRENT_SOURCE_DIR}${source}")
     endforeach(source ${sources} ${ARGN})
+    
+    install(FILES ${sources} ${ARGN}
+        DESTINATION "${add_headers_INSTALL_DIR}"
+        COMPONENT "${add_headers_INSTALL_COMPONENT}"
+        )
+    
     set(${add_headers_VAR} ${${add_headers_VAR}} PARENT_SCOPE)
 endmacro(add_headers sources)
@@ -173,5 +182,5 @@
 
 # Headers to be exported
-set(libariba_HEADERS
+add_headers(
     ariba.h
     AribaModule.h
@@ -189,5 +198,5 @@
     )
 
-set(libariba_SOURCES
+add_sources(
     AribaModule.cpp
     CommunicationListener.cpp
@@ -247,5 +256,5 @@
 
 
-# Installation stuff
+# Install binaries
 install(TARGETS ariba ${ariba_STATIC_TARGET} EXPORT ariba-targets
     LIBRARY DESTINATION lib COMPONENT Runtime
@@ -254,8 +263,4 @@
     )
 
-install(FILES ${libariba_HEADERS}
-    DESTINATION include/ariba
-    COMPONENT Development
-    )
 
 # Make libariba usable from build tree