ledbar: rename to my9221

* Use new cmake macro

Signed-off-by: Thomas Ingleby <thomas.c.ingleby@intel.com>

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 1e96ea1..0b36feb 100644 (file)
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -18,7 +18,7 @@ include_directories (${PROJECT_SOURCE_DIR}/src/hmc5883l)
 include_directories (${PROJECT_SOURCE_DIR}/src/grove)
 include_directories (${PROJECT_SOURCE_DIR}/src/lcd)
 include_directories (${PROJECT_SOURCE_DIR}/src/buzzer)
-include_directories (${PROJECT_SOURCE_DIR}/src/ledbar)
+include_directories (${PROJECT_SOURCE_DIR}/src/my9221)
 include_directories (${PROJECT_SOURCE_DIR}/src/tm1637)
 include_directories (${PROJECT_SOURCE_DIR}/src/nrf24l01)
 include_directories (${PROJECT_SOURCE_DIR}/src/servo)
@@ -31,7 +31,7 @@ target_link_libraries (grovetemp grove ${CMAKE_THREAD_LIBS_INIT})
 target_link_libraries (lcm-lcd i2clcd ${CMAKE_THREAD_LIBS_INIT})
 target_link_libraries (rgb-lcd i2clcd ${CMAKE_THREAD_LIBS_INIT})
 target_link_libraries (buzzer-sound buzzer ${CMAKE_THREAD_LIBS_INIT})
-target_link_libraries (led-bar ledbar ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries (led-bar my9221 ${CMAKE_THREAD_LIBS_INIT})
 target_link_libraries (seg-lcd tm1637 ${CMAKE_THREAD_LIBS_INIT})
 target_link_libraries (nrf_transmitter nrf24l01 ${CMAKE_THREAD_LIBS_INIT})
 target_link_libraries (nrf_receiver nrf24l01 ${CMAKE_THREAD_LIBS_INIT})

diff --git a/src/ledbar/CMakeLists.txt b/src/ledbar/CMakeLists.txt
deleted file mode 100644 (file)
index b159b61..0000000
--- a/src/ledbar/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-set (libname "ledbar")
-add_library (ledbar SHARED my9221.cxx)
-include_directories (${MAA_INCLUDE_DIR})
-target_link_libraries (ledbar ${MAA_LIBRARIES})
-
-install (TARGETS ${libname} DESTINATION lib/upm COMPONENT ${libname})
-install (FILES my9221.h DESTINATION include/upm COMPONENT ${libname})
-
-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/my9221/CMakeLists.txt b/src/my9221/CMakeLists.txt
new file mode 100644 (file)
index 0000000..4d48330
--- /dev/null
+++ b/src/my9221/CMakeLists.txt
@@ -0,0 +1,4 @@
+set (libname "my9221")
+set (libdecription "upm ledbar")
+add_library (${libname} SHARED my9221.cxx)
+upm_module_init()

diff --git a/src/ledbar/jsupm_my9221.i b/src/my9221/jsupm_my9221.i
similarity index 100%
rename from src/ledbar/jsupm_my9221.i
rename to src/my9221/jsupm_my9221.i

diff --git a/src/ledbar/my9221.cxx b/src/my9221/my9221.cxx
similarity index 100%
rename from src/ledbar/my9221.cxx
rename to src/my9221/my9221.cxx

diff --git a/src/ledbar/my9221.h b/src/my9221/my9221.h
similarity index 100%
rename from src/ledbar/my9221.h
rename to src/my9221/my9221.h

diff --git a/src/ledbar/pyupm_my9221.i b/src/my9221/pyupm_my9221.i
similarity index 100%
rename from src/ledbar/pyupm_my9221.i
rename to src/my9221/pyupm_my9221.i