aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorMauro Sardara <msardara+fdio@cisco.com>2017-04-29 21:14:25 +0200
committerMauro Sardara <msardara+fdio@cisco.com>2017-04-29 22:11:51 +0200
commit844daaec88924ba1f374c7bd8fd69692904012ed (patch)
tree0d8bca1560ee58cc227e9386758f23def4147bd6 /apps
parent307d69f67c01dbf05b1da447589645713d6ca27b (diff)
Adding dev and doc package support.
Change-Id: I89b4aa6598d88226a1eafd6b7240a30be3d795c3 Signed-off-by: Mauro Sardara <msardara+fdio@cisco.com>
Diffstat (limited to 'apps')
-rwxr-xr-xapps/consumers/CMakeLists.txt6
-rw-r--r--apps/iping/CMakeLists.txt4
-rwxr-xr-xapps/producers/CMakeLists.txt2
-rwxr-xr-xapps/producers/icnet_producer_test.cc2
4 files changed, 7 insertions, 7 deletions
diff --git a/apps/consumers/CMakeLists.txt b/apps/consumers/CMakeLists.txt
index b9314060..68e79834 100755
--- a/apps/consumers/CMakeLists.txt
+++ b/apps/consumers/CMakeLists.txt
@@ -25,6 +25,6 @@ target_link_libraries(consumer-test icnet ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBR
target_link_libraries(iget icnet ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
target_link_libraries(consumer-dash icnet ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
-install(TARGETS consumer-test DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-install(TARGETS iget DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-install(TARGETS consumer-dash DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+install(TARGETS consumer-test DESTINATION ${CMAKE_INSTALL_PREFIX}/bin COMPONENT library)
+install(TARGETS iget DESTINATION ${CMAKE_INSTALL_PREFIX}/bin COMPONENT library)
+install(TARGETS consumer-dash DESTINATION ${CMAKE_INSTALL_PREFIX}/bin COMPONENT library)
diff --git a/apps/iping/CMakeLists.txt b/apps/iping/CMakeLists.txt
index 5bd2ec5f..b2fa4874 100644
--- a/apps/iping/CMakeLists.txt
+++ b/apps/iping/CMakeLists.txt
@@ -43,8 +43,8 @@ link_directories(${CCNX_HOME}/lib)
add_executable(iPing_Client ${CCNX_PING_CLIENT_SOURCE_FILES})
target_link_libraries(iPing_Client ${CCNX_LIBRARIES})
-install(TARGETS iPing_Client RUNTIME DESTINATION bin)
+install(TARGETS iPing_Client RUNTIME DESTINATION bin COMPONENT library)
add_executable(iPing_Server ${CCNX_PING_SERVER_SOURCE_FILES})
target_link_libraries(iPing_Server ${CCNX_LIBRARIES})
-install(TARGETS iPing_Server RUNTIME DESTINATION bin)
+install(TARGETS iPing_Server RUNTIME DESTINATION bin COMPONENT library)
diff --git a/apps/producers/CMakeLists.txt b/apps/producers/CMakeLists.txt
index c478bf53..9259394e 100755
--- a/apps/producers/CMakeLists.txt
+++ b/apps/producers/CMakeLists.txt
@@ -19,4 +19,4 @@ set(PRODUCER_SOURCE_FILES
add_executable(producer-test ${PRODUCER_SOURCE_FILES})
target_link_libraries(producer-test icnet ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
-install(TARGETS producer-test DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+install(TARGETS producer-test DESTINATION ${CMAKE_INSTALL_PREFIX}/bin COMPONENT library)
diff --git a/apps/producers/icnet_producer_test.cc b/apps/producers/icnet_producer_test.cc
index 6add25d3..c122090a 100755
--- a/apps/producers/icnet_producer_test.cc
+++ b/apps/producers/icnet_producer_test.cc
@@ -25,7 +25,7 @@ class CallbackContainer {
: buffer_(1400, 'X'), final_chunk_number_(0) {
content_object_.setContent((uint8_t *) buffer_.c_str(), 1400);
if (download_size > 0) {
- final_chunk_number_ = static_cast<uint64_t>(std::ceil(download_size / 1400));
+ final_chunk_number_ = static_cast<uint64_t>(std::ceil(download_size / 1400.0));
}
}