Browse Source

upm: add protection around function for packaging

* Would not build if not building IPK.

Signed-off-by: Thomas Ingleby <thomas.c.ingleby@intel.com>
Thomas Ingleby 10 years ago
parent
commit
1ff0e5ee57

+ 4
- 2
src/4digitdisplay/CMakeLists.txt View File

@@ -6,5 +6,7 @@ target_link_libraries (4digitdisplay ${MAA_LIBRARIES})
6 6
 install (TARGETS ${libname} DESTINATION lib/upm COMPONENT ${libname})
7 7
 install (FILES tm1637.h DESTINATION include/upm COMPONENT ${libname})
8 8
 
9
-cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all)
10
-set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm 4 Digit Buzzer")
9
+if (IPK)
10
+  cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all)
11
+  set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm 4 Digit Buzzer")
12
+endif()

+ 4
- 2
src/buzzer/CMakeLists.txt View File

@@ -6,5 +6,7 @@ target_link_libraries (buzzer ${MAA_LIBRARIES})
6 6
 install (TARGETS ${libname} DESTINATION lib/upm COMPONENT ${libname})
7 7
 install (FILES buzzer.h DESTINATION include/upm COMPONENT ${libname})
8 8
 
9
-cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all)
10
-set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm buzzer")
9
+if (IPK)
10
+  cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all)
11
+  set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm buzzer")
12
+endif()

+ 4
- 2
src/grove/CMakeLists.txt View File

@@ -41,5 +41,7 @@ endif ()
41 41
 install (TARGETS ${libname} DESTINATION lib/upm COMPONENT ${libname})
42 42
 install (FILES grove.h DESTINATION include/upm COMPONENT ${libname})
43 43
 
44
-cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all)
45
-set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm grove libary")
44
+if (IPK)
45
+  cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all)
46
+  set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm grove libary")
47
+endif()

+ 4
- 2
src/hcsr04/CMakeLists.txt View File

@@ -6,5 +6,7 @@ target_link_libraries (hcsr04 ${MAA_LIBRARIES})
6 6
 install (TARGETS ${libname} DESTINATION lib/upm COMPONENT ${libname})
7 7
 install (FILES hcsr04.h DESTINATION include/upm COMPONENT ${libname})
8 8
 
9
-cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all)
10
-set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm proximity sensor")
9
+if (IPK)
10
+  cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all)
11
+  set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm proximity sensor")
12
+endif()

+ 4
- 2
src/hmc5883l/CMakeLists.txt View File

@@ -41,5 +41,7 @@ endif ()
41 41
 install (TARGETS ${libname} DESTINATION lib/upm COMPONENT ${libname})
42 42
 install (FILES hmc5883l.h DESTINATION include/upm COMPONENT ${libname})
43 43
 
44
-cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all)
45
-set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm Digital Compass")
44
+if (IPK)
45
+  cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all)
46
+  set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm Digital Compass")
47
+endif()

+ 4
- 2
src/lcd/CMakeLists.txt View File

@@ -6,5 +6,7 @@ target_link_libraries (i2clcd ${MAA_LIBRARIES})
6 6
 install (TARGETS ${libname} DESTINATION lib/upm COMPONENT ${libname})
7 7
 install (FILES iiclcd.h DESTINATION include/upm COMPONENT ${libname})
8 8
 
9
-cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all)
10
-set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm lcd")
9
+if (IPK)
10
+  cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all)
11
+  set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm lcd")
12
+endif()

+ 4
- 2
src/ledbar/CMakeLists.txt View File

@@ -6,6 +6,8 @@ target_link_libraries (ledbar ${MAA_LIBRARIES})
6 6
 install (TARGETS ${libname} DESTINATION lib/upm COMPONENT ${libname})
7 7
 install (FILES my9221.h DESTINATION include/upm COMPONENT ${libname})
8 8
 
9
-cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all)
10
-set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm LEDBAR")
9
+if (IPK)
10
+  cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all)
11
+  set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm LEDBAR")
12
+endif()
11 13
 

+ 4
- 3
src/max44000/CMakeLists.txt View File

@@ -6,6 +6,7 @@ target_link_libraries (max44000 ${MAA_LIBRARIES})
6 6
 install (TARGETS ${libname} DESTINATION lib/upm COMPONENT ${libname})
7 7
 install (FILES max44000.h DESTINATION include/upm COMPONENT ${libname})
8 8
 
9
-cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all)
10
-set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm MAX44000")
11
-
9
+if (IPK)
10
+  cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all)
11
+  set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm MAX44000")
12
+endif()

+ 4
- 2
src/nrf24l01/CMakeLists.txt View File

@@ -6,5 +6,7 @@ target_link_libraries (nrf24l01 ${MAA_LIBRARIES})
6 6
 install (TARGETS ${libname} DESTINATION lib/upm COMPONENT ${libname})
7 7
 install (FILES nrf24l01.h DESTINATION include/upm COMPONENT ${libname})
8 8
 
9
-cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all)
10
-set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm NRF tx/rx")
9
+if (IPK)
10
+  cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all)
11
+  set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm NRF tx/rx")
12
+endif()

+ 4
- 2
src/servo/CMakeLists.txt View File

@@ -6,5 +6,7 @@ target_link_libraries (servo ${MAA_LIBRARIES})
6 6
 install (TARGETS ${libname} DESTINATION lib/upm COMPONENT ${libname})
7 7
 install (FILES servo.h DESTINATION include/upm COMPONENT ${libname})
8 8
 
9
-cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all)
10
-set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm servo")
9
+if (IPK)
10
+  cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all)
11
+  set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm servo")
12
+endif()