From 1ff0e5ee5751e2557e63f020ec5c216ba74dd168 Mon Sep 17 00:00:00 2001 From: Thomas Ingleby Date: Mon, 9 Jun 2014 17:58:10 +0100 Subject: [PATCH] upm: add protection around function for packaging * Would not build if not building IPK. Signed-off-by: Thomas Ingleby --- src/4digitdisplay/CMakeLists.txt | 6 ++++-- src/buzzer/CMakeLists.txt | 6 ++++-- src/grove/CMakeLists.txt | 6 ++++-- src/hcsr04/CMakeLists.txt | 6 ++++-- src/hmc5883l/CMakeLists.txt | 6 ++++-- src/lcd/CMakeLists.txt | 6 ++++-- src/ledbar/CMakeLists.txt | 6 ++++-- src/max44000/CMakeLists.txt | 7 ++++--- src/nrf24l01/CMakeLists.txt | 6 ++++-- src/servo/CMakeLists.txt | 6 ++++-- 10 files changed, 40 insertions(+), 21 deletions(-) diff --git a/src/4digitdisplay/CMakeLists.txt b/src/4digitdisplay/CMakeLists.txt index 15e073b..1e06c5a 100644 --- a/src/4digitdisplay/CMakeLists.txt +++ b/src/4digitdisplay/CMakeLists.txt @@ -6,5 +6,7 @@ target_link_libraries (4digitdisplay ${MAA_LIBRARIES}) install (TARGETS ${libname} DESTINATION lib/upm COMPONENT ${libname}) install (FILES tm1637.h DESTINATION include/upm COMPONENT ${libname}) -cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all) -set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm 4 Digit Buzzer") +if (IPK) + cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all) + set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm 4 Digit Buzzer") +endif() diff --git a/src/buzzer/CMakeLists.txt b/src/buzzer/CMakeLists.txt index d9efd23..ae388e0 100644 --- a/src/buzzer/CMakeLists.txt +++ b/src/buzzer/CMakeLists.txt @@ -6,5 +6,7 @@ target_link_libraries (buzzer ${MAA_LIBRARIES}) install (TARGETS ${libname} DESTINATION lib/upm COMPONENT ${libname}) install (FILES buzzer.h DESTINATION include/upm COMPONENT ${libname}) -cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all) -set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm buzzer") +if (IPK) + cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all) + set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm buzzer") +endif() diff --git a/src/grove/CMakeLists.txt b/src/grove/CMakeLists.txt index 0fd9774..4264068 100644 --- a/src/grove/CMakeLists.txt +++ b/src/grove/CMakeLists.txt @@ -41,5 +41,7 @@ endif () install (TARGETS ${libname} DESTINATION lib/upm COMPONENT ${libname}) install (FILES grove.h DESTINATION include/upm COMPONENT ${libname}) -cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all) -set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm grove libary") +if (IPK) + cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all) + set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm grove libary") +endif() diff --git a/src/hcsr04/CMakeLists.txt b/src/hcsr04/CMakeLists.txt index b020a12..695d2e3 100644 --- a/src/hcsr04/CMakeLists.txt +++ b/src/hcsr04/CMakeLists.txt @@ -6,5 +6,7 @@ target_link_libraries (hcsr04 ${MAA_LIBRARIES}) install (TARGETS ${libname} DESTINATION lib/upm COMPONENT ${libname}) install (FILES hcsr04.h DESTINATION include/upm COMPONENT ${libname}) -cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all) -set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm proximity sensor") +if (IPK) + cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all) + set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm proximity sensor") +endif() diff --git a/src/hmc5883l/CMakeLists.txt b/src/hmc5883l/CMakeLists.txt index 2d9d02e..44ada7b 100644 --- a/src/hmc5883l/CMakeLists.txt +++ b/src/hmc5883l/CMakeLists.txt @@ -41,5 +41,7 @@ endif () install (TARGETS ${libname} DESTINATION lib/upm COMPONENT ${libname}) install (FILES hmc5883l.h DESTINATION include/upm COMPONENT ${libname}) -cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all) -set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm Digital Compass") +if (IPK) + cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all) + set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm Digital Compass") +endif() diff --git a/src/lcd/CMakeLists.txt b/src/lcd/CMakeLists.txt index 33ca1de..592c3be 100644 --- a/src/lcd/CMakeLists.txt +++ b/src/lcd/CMakeLists.txt @@ -6,5 +6,7 @@ target_link_libraries (i2clcd ${MAA_LIBRARIES}) install (TARGETS ${libname} DESTINATION lib/upm COMPONENT ${libname}) install (FILES iiclcd.h DESTINATION include/upm COMPONENT ${libname}) -cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all) -set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm lcd") +if (IPK) + cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all) + set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm lcd") +endif() diff --git a/src/ledbar/CMakeLists.txt b/src/ledbar/CMakeLists.txt index 266fb89..b159b61 100644 --- a/src/ledbar/CMakeLists.txt +++ b/src/ledbar/CMakeLists.txt @@ -6,6 +6,8 @@ target_link_libraries (ledbar ${MAA_LIBRARIES}) install (TARGETS ${libname} DESTINATION lib/upm COMPONENT ${libname}) install (FILES my9221.h DESTINATION include/upm COMPONENT ${libname}) -cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all) -set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm LEDBAR") +if (IPK) + cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all) + set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm LEDBAR") +endif() diff --git a/src/max44000/CMakeLists.txt b/src/max44000/CMakeLists.txt index db57a85..ab75f7c 100644 --- a/src/max44000/CMakeLists.txt +++ b/src/max44000/CMakeLists.txt @@ -6,6 +6,7 @@ target_link_libraries (max44000 ${MAA_LIBRARIES}) install (TARGETS ${libname} DESTINATION lib/upm COMPONENT ${libname}) install (FILES max44000.h DESTINATION include/upm COMPONENT ${libname}) -cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all) -set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm MAX44000") - +if (IPK) + cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all) + set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm MAX44000") +endif() diff --git a/src/nrf24l01/CMakeLists.txt b/src/nrf24l01/CMakeLists.txt index 67ebd44..3fce906 100644 --- a/src/nrf24l01/CMakeLists.txt +++ b/src/nrf24l01/CMakeLists.txt @@ -6,5 +6,7 @@ target_link_libraries (nrf24l01 ${MAA_LIBRARIES}) install (TARGETS ${libname} DESTINATION lib/upm COMPONENT ${libname}) install (FILES nrf24l01.h DESTINATION include/upm COMPONENT ${libname}) -cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all) -set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm NRF tx/rx") +if (IPK) + cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all) + set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm NRF tx/rx") +endif() diff --git a/src/servo/CMakeLists.txt b/src/servo/CMakeLists.txt index 6646398..73d09c2 100644 --- a/src/servo/CMakeLists.txt +++ b/src/servo/CMakeLists.txt @@ -6,5 +6,7 @@ target_link_libraries (servo ${MAA_LIBRARIES}) install (TARGETS ${libname} DESTINATION lib/upm COMPONENT ${libname}) install (FILES servo.h DESTINATION include/upm COMPONENT ${libname}) -cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all) -set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm servo") +if (IPK) + cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all) + set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm servo") +endif() -- 2.7.4