Changeset 10788

Timestamp:

Nov 14, 2012, 5:27:23 PM (12 years ago)

Author:

Michael Tänzer

Message:

CMake: Fix bug that caused the headers all to be installed flat (instead of a hierarchy)

File:

• source/ariba/CMakeLists.txt (modified) (7 diffs)

source/ariba/CMakeLists.txt

@@ -138 +138 @@
 
 
+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 +146 @@
 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 +164 @@
         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 +182 @@
 
 # Headers to be exported
-set(libariba_HEADERS
+add_headers(
     ariba.h
     AribaModule.h
@@ -189 +198 @@
     )
 
-set(libariba_SOURCES
+add_sources(
     AribaModule.cpp
     CommunicationListener.cpp
@@ -247 +256 @@
 
 
-# Installation stuff
+# Install binaries
 install(TARGETS ariba ${ariba_STATIC_TARGET} EXPORT ariba-targets
     LIBRARY DESTINATION lib COMPONENT Runtime
@@ -254 +263 @@
     )
 
-install(FILES ${libariba_HEADERS}
-    DESTINATION include/ariba
-    COMPONENT Development
-    )
 
 # Make libariba usable from build tree