From: Thomas Ingleby Date: Wed, 11 Jun 2014 14:07:21 +0000 (+0100) Subject: 4digitdisplay: rename to tm1637 X-Git-Tag: v0.1.3~6 X-Git-Url: http://review.tizen.org/git/?p=contrib%2Fupm.git;a=commitdiff_plain;h=3dccffe0552a434ebdee00e5f54920cbac784c58 4digitdisplay: rename to tm1637 * Use new cmake macro Signed-off-by: Thomas Ingleby --- diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 3206cd7..1e96ea1 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -19,7 +19,7 @@ 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/4digitdisplay) +include_directories (${PROJECT_SOURCE_DIR}/src/tm1637) include_directories (${PROJECT_SOURCE_DIR}/src/nrf24l01) include_directories (${PROJECT_SOURCE_DIR}/src/servo) include_directories (${PROJECT_SOURCE_DIR}/src/hcsr04) @@ -32,7 +32,7 @@ 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 (seg-lcd 4digitdisplay ${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}) target_link_libraries (es08a servo ${CMAKE_THREAD_LIBS_INIT}) diff --git a/src/4digitdisplay/CMakeLists.txt b/src/4digitdisplay/CMakeLists.txt deleted file mode 100644 index 1e06c5a..0000000 --- a/src/4digitdisplay/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -set (libname "4digitdisplay") -add_library (4digitdisplay SHARED tm1637.cxx) -include_directories (${MAA_INCLUDE_DIR}) -target_link_libraries (4digitdisplay ${MAA_LIBRARIES}) - -install (TARGETS ${libname} DESTINATION lib/upm COMPONENT ${libname}) -install (FILES tm1637.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 4 Digit Buzzer") -endif() diff --git a/src/tm1637/CMakeLists.txt b/src/tm1637/CMakeLists.txt new file mode 100644 index 0000000..f2de7b3 --- /dev/null +++ b/src/tm1637/CMakeLists.txt @@ -0,0 +1,4 @@ +set (libname "tm1637") +set (libdescription "upm 4 digit display tm1637") +add_library (${libname} SHARED tm1637.cxx) +upm_module_init() diff --git a/src/4digitdisplay/jsupm_tm1637.i b/src/tm1637/jsupm_tm1637.i similarity index 100% rename from src/4digitdisplay/jsupm_tm1637.i rename to src/tm1637/jsupm_tm1637.i diff --git a/src/4digitdisplay/pyupm_tm1637.i b/src/tm1637/pyupm_tm1637.i similarity index 100% rename from src/4digitdisplay/pyupm_tm1637.i rename to src/tm1637/pyupm_tm1637.i diff --git a/src/4digitdisplay/tm1637.cxx b/src/tm1637/tm1637.cxx similarity index 100% rename from src/4digitdisplay/tm1637.cxx rename to src/tm1637/tm1637.cxx diff --git a/src/4digitdisplay/tm1637.h b/src/tm1637/tm1637.h similarity index 100% rename from src/4digitdisplay/tm1637.h rename to src/tm1637/tm1637.h