From cdd6b2a782f50d635e5da73dd94ce39508ddcf19 Mon Sep 17 00:00:00 2001
From: Mauro Sardara <msardara+fdio@cisco.com>
Date: Sat, 29 Apr 2017 20:39:24 +0200
Subject: Adding support for dev and doc packages.

Change-Id: Ie084c1db30436d754a6e3e0045c9659ef24603c9
Signed-off-by: Mauro Sardara <msardara+fdio@cisco.com>
---
 libccnx-portal/ccnx/api/ccnx_Portal/CMakeLists.txt | 42 +++++++++++-----------
 .../api/ccnx_Portal/command-line/CMakeLists.txt    | 12 +++----
 .../ccnx/api/ccnx_Portal/test/CMakeLists.txt       | 11 +++---
 3 files changed, 32 insertions(+), 33 deletions(-)

(limited to 'libccnx-portal/ccnx/api/ccnx_Portal')

diff --git a/libccnx-portal/ccnx/api/ccnx_Portal/CMakeLists.txt b/libccnx-portal/ccnx/api/ccnx_Portal/CMakeLists.txt
index b4d2a136..a7d9e8dd 100644
--- a/libccnx-portal/ccnx/api/ccnx_Portal/CMakeLists.txt
+++ b/libccnx-portal/ccnx/api/ccnx_Portal/CMakeLists.txt
@@ -3,36 +3,36 @@
 configure_file(config.h.in config.h @ONLY)
 
 set(CCNX_API_PORTAL_HEADERS
-	ccnx_Portal.h 
-	ccnx_PortalFactory.h 
-	ccnx_PortalAttributes.h 
-	ccnx_PortalStack.h 
-	ccnx_PortalRTA.h 
-    ccnx_PortalAPI.h 
-    ccnx_PortalAnchor.h 
+	ccnx_Portal.h
+	ccnx_PortalFactory.h
+	ccnx_PortalAttributes.h
+	ccnx_PortalStack.h
+	ccnx_PortalRTA.h
+	ccnx_PortalAPI.h
+	ccnx_PortalAnchor.h
 	ccnxPortal_About.h
 	)
 
 set(CCNX_API_PORTAL_SOURCE_FILES
    ${CCNX_API_PORTAL_HEADERS}
-    ccnx_Portal.c 
-    ccnx_PortalFactory.c 
-    ccnx_PortalAttributes.c 
-    ccnx_PortalStack.c 
-    ccnx_PortalRTA.c 
-    ccnx_PortalAPI.c 
-    ccnx_PortalAnchor.c 
-	ccnxPortal_About.c
-	)
+    ccnx_Portal.c
+    ccnx_PortalFactory.c
+    ccnx_PortalAttributes.c
+    ccnx_PortalStack.c
+    ccnx_PortalRTA.c
+    ccnx_PortalAPI.c
+    ccnx_PortalAnchor.c
+    ccnxPortal_About.c
+    )
 
 source_group(Sources FILES ${CCNX_API_PORTAL_SOURCE_FILES})
 source_group(Sources FILES ${CCNX_API_PORTAL_HEADERS})
 
 add_library(ccnx_api_portal         STATIC ${CCNX_API_PORTAL_SOURCE_FILES} ${CCNX_API_PORTAL_HEADER_FILES})
 add_library(ccnx_api_portal.shared  SHARED ${CCNX_API_PORTAL_SOURCE_FILES})
-set_target_properties(ccnx_api_portal.shared PROPERTIES 
+set_target_properties(ccnx_api_portal.shared PROPERTIES
   C_STANDARD 99
-  SOVERSION 1 
+  SOVERSION 1
   VERSION 1.0
   OUTPUT_NAME ccnx_api_portal )
 
@@ -42,11 +42,11 @@ set(libccnx_api_portal_libraries
   )
 
 foreach(lib ${libccnx_api_portal_libraries})
-  install(TARGETS ${lib} LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
+  install(TARGETS ${lib} COMPONENT library LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
   set_property(TARGET ${lib} PROPERTY C_STANDARD 99)
 endforeach()
 
-install(FILES ${CCNX_API_PORTAL_HEADERS} DESTINATION include/ccnx/api/ccnx_Portal )
-	
+install(FILES ${CCNX_API_PORTAL_HEADERS} DESTINATION include/ccnx/api/ccnx_Portal COMPONENT headers)
+
 add_subdirectory(test)
 add_subdirectory(command-line)
diff --git a/libccnx-portal/ccnx/api/ccnx_Portal/command-line/CMakeLists.txt b/libccnx-portal/ccnx/api/ccnx_Portal/command-line/CMakeLists.txt
index 6d0a3f09..9c91aadd 100644
--- a/libccnx-portal/ccnx/api/ccnx_Portal/command-line/CMakeLists.txt
+++ b/libccnx-portal/ccnx/api/ccnx_Portal/command-line/CMakeLists.txt
@@ -1,11 +1,11 @@
 set(CCNX_CLIENT_SRC
-  ccnx-client.c 
-  ccnxPortalClient_About.c 
+  ccnx-client.c
+  ccnxPortalClient_About.c
   )
 
-set(CCNX_SERVER_SRC 
-  ccnx-server.c 
-  ccnxPortalServer_About.c 
+set(CCNX_SERVER_SRC
+  ccnx-server.c
+  ccnxPortalServer_About.c
   )
 
 
@@ -16,4 +16,4 @@ target_link_libraries(ccnx-client ${CCNX_LINK_LIBRARIES})
 add_executable(ccnx-server ${CCNX_SERVER_SRC})
 target_link_libraries(ccnx-server ${CCNX_LINK_LIBRARIES})
 
-install(TARGETS ccnx-client ccnx-server RUNTIME DESTINATION bin )
+install(TARGETS ccnx-client ccnx-server COMPONENT library RUNTIME DESTINATION bin )
diff --git a/libccnx-portal/ccnx/api/ccnx_Portal/test/CMakeLists.txt b/libccnx-portal/ccnx/api/ccnx_Portal/test/CMakeLists.txt
index 88ce6f1a..9c2a94ff 100644
--- a/libccnx-portal/ccnx/api/ccnx_Portal/test/CMakeLists.txt
+++ b/libccnx-portal/ccnx/api/ccnx_Portal/test/CMakeLists.txt
@@ -3,15 +3,14 @@ add_definitions(--coverage)
 set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} " --coverage")
 
 set(TestsExpectedToPass
-	test_ccnx_Portal 
-	test_ccnx_PortalFactory 
-	test_ccnx_PortalStack 
-   	test_ccnx_PortalAPI 
-	test_ccnx_PortalRTA 
+	test_ccnx_Portal
+	test_ccnx_PortalFactory
+	test_ccnx_PortalStack
+   	test_ccnx_PortalAPI
+	test_ccnx_PortalRTA
 	test_ccnx_PortalAnchor
 )
 
-  
 foreach(test ${TestsExpectedToPass})
    AddTest(${test})
 endforeach()
-- 
cgit 1.2.3-korg