diff --git a/src/buzzer/CMakeLists.txt b/src/buzzer/CMakeLists.txt index ae388e01..8de1b98a 100644 --- a/src/buzzer/CMakeLists.txt +++ b/src/buzzer/CMakeLists.txt @@ -1,12 +1,4 @@ set (libname "buzzer") +set (libdescription "upm buzzer") add_library (buzzer SHARED buzzer.cxx) -include_directories (${MAA_INCLUDE_DIR}) -target_link_libraries (buzzer ${MAA_LIBRARIES}) - -install (TARGETS ${libname} DESTINATION lib/upm COMPONENT ${libname}) -install (FILES buzzer.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 buzzer") -endif() +upm_module_init() diff --git a/src/grove/CMakeLists.txt b/src/grove/CMakeLists.txt index 42640689..8f570441 100644 --- a/src/grove/CMakeLists.txt +++ b/src/grove/CMakeLists.txt @@ -1,47 +1,4 @@ set (libname "grove") +set (libdescription "upm grove module") add_library (grove SHARED grove.cxx) -include_directories (${MAA_INCLUDE_DIR}) -target_link_libraries (grove ${MAA_LIBRARIES}) - -if (SWIG_FOUND) - find_package (PythonLibs) - - include_directories ( - ${PYTHON_INCLUDE_PATH} - ${PYTHON_INCLUDE_DIRS} - ${MAA_INCLUDE_DIR} - . - ) - - set_source_files_properties (pyupm_grove.i PROPERTIES CPLUSPLUS ON) - set_source_files_properties (jsupm_grove.i PROPERTIES CPLUSPLUS ON) - set_source_files_properties (jsupm_grove.i PROPERTIES SWIG_FLAGS "-node") - - swig_add_module (pyupm_grove python pyupm_grove.i grove.cxx) -# swig_add_module (jsupm_grove javascript jsupm_grove.i grove.cxx) - - swig_link_libraries (pyupm_grove ${PYTHON_LIBRARIES} ${MAA_LIBRARIES}) -# swig_link_libraries (jsupm_grove ${MAA_LIBRARIES}) - - if (DOXYGEN_FOUND) - set (CMAKE_SWIG_FLAGS -DDOXYGEN=${DOXYGEN_FOUND}) - add_custom_command (OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${libname}_doc.i - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../doxy2swig.py -n - ${CMAKE_BINARY_DIR}/xml/${libname}_8h.xml - ${CMAKE_CURRENT_BINARY_DIR}/${libname}_doc.i - DEPENDS ${CMAKE_BINARY_DIR}/xml/${libname}_8h.xml - ) - add_custom_target (${libname}doc_i DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${libname}_doc.i) - add_dependencies (${libname}doc_i doc) - add_dependencies (${SWIG_MODULE_pyupm_grove_REAL_NAME} ${libname}doc_i) - endif () - -endif () - -install (TARGETS ${libname} DESTINATION lib/upm COMPONENT ${libname}) -install (FILES grove.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 grove libary") -endif() +upm_module_init() diff --git a/src/hcsr04/CMakeLists.txt b/src/hcsr04/CMakeLists.txt index 695d2e30..103bf0c8 100644 --- a/src/hcsr04/CMakeLists.txt +++ b/src/hcsr04/CMakeLists.txt @@ -1,12 +1,4 @@ set (libname "hcsr04") +set (libdescription "upm proximity sensor") add_library (hcsr04 SHARED hcsr04.cxx) -include_directories (${MAA_INCLUDE_DIR}) -target_link_libraries (hcsr04 ${MAA_LIBRARIES}) - -install (TARGETS ${libname} DESTINATION lib/upm COMPONENT ${libname}) -install (FILES hcsr04.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 proximity sensor") -endif() +upm_module_init() diff --git a/src/hmc5883l/CMakeLists.txt b/src/hmc5883l/CMakeLists.txt index 44ada7b2..05b52deb 100644 --- a/src/hmc5883l/CMakeLists.txt +++ b/src/hmc5883l/CMakeLists.txt @@ -1,47 +1,4 @@ set (libname "hmc5883l") +set (libdescription "libupm Digital Compass") add_library (hmc5883l SHARED hmc5883l.cxx) -include_directories (${MAA_INCLUDE_DIR}) -target_link_libraries (hmc5883l ${MAA_LIBRARIES}) - -if (SWIG_FOUND) - find_package (PythonLibs) - - include_directories ( - ${PYTHON_INCLUDE_PATH} - ${PYTHON_INCLUDE_DIRS} - ${MAA_INCLUDE_DIR} - . - ) - - set_source_files_properties (pyupm_hmc5883l.i PROPERTIES CPLUSPLUS ON) - set_source_files_properties (jsupm_hmc5883l.i PROPERTIES CPLUSPLUS ON) - set_source_files_properties (jsupm_hmc5883l.i PROPERTIES SWIG_FLAGS "-node") - - swig_add_module (pyupm_hmc5883l python pyupm_hmc5883l.i hmc5883l.cxx) -# swig_add_module (jsupm_hmc5883l javascript jsupm_hmc5883l.i hmc5883l.cxx) - - swig_link_libraries (pyupm_hmc5883l ${PYTHON_LIBRARIES} ${MAA_LIBRARIES}) -# swig_link_libraries (jsupm_hmc5883l ${MAA_LIBRARIES}) - - if (DOXYGEN_FOUND) - set (CMAKE_SWIG_FLAGS -DDOXYGEN=${DOXYGEN_FOUND}) - add_custom_command (OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${libname}_doc.i - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../doxy2swig.py -n - ${CMAKE_BINARY_DIR}/xml/${libname}_8h.xml - ${CMAKE_CURRENT_BINARY_DIR}/${libname}_doc.i - DEPENDS ${CMAKE_BINARY_DIR}/xml/${libname}_8h.xml - ) - add_custom_target (${libname}doc_i DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${libname}_doc.i) - add_dependencies (${libname}doc_i doc) - add_dependencies (${SWIG_MODULE_pyupm_hmc5883l_REAL_NAME} ${libname}doc_i) - endif () - -endif () - -install (TARGETS ${libname} DESTINATION lib/upm COMPONENT ${libname}) -install (FILES hmc5883l.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 Digital Compass") -endif() +upm_module_init() diff --git a/src/max44000/CMakeLists.txt b/src/max44000/CMakeLists.txt index 666c5274..69365ede 100644 --- a/src/max44000/CMakeLists.txt +++ b/src/max44000/CMakeLists.txt @@ -1,47 +1,4 @@ set (libname "max44000") +set (libdescription "upm MAX44000") add_library (max44000 SHARED max44000.cxx) -include_directories (${MAA_INCLUDE_DIR}) -target_link_libraries (max44000 ${MAA_LIBRARIES}) - -if (SWIG_FOUND) - find_package (PythonLibs) - - include_directories ( - ${PYTHON_INCLUDE_PATH} - ${PYTHON_INCLUDE_DIRS} - ${MAA_INCLUDE_DIR} - . - ) - - set_source_files_properties (pyupm_max44000.i PROPERTIES CPLUSPLUS ON) - set_source_files_properties (jsupm_max44000.i PROPERTIES CPLUSPLUS ON) - set_source_files_properties (jsupm_max44000.i PROPERTIES SWIG_FLAGS "-node") - - swig_add_module (pyupm_max44000 python pyupm_max44000.i max44000.cxx) -# swig_add_module (jsupm_grove javascript jsupm_grove.i grove.cxx) - - swig_link_libraries (pyupm_max44000 ${PYTHON_LIBRARIES} ${MAA_LIBRARIES}) -# swig_link_libraries (jsupm_grove ${MAA_LIBRARIES}) - - if (DOXYGEN_FOUND) - set (CMAKE_SWIG_FLAGS -DDOXYGEN=${DOXYGEN_FOUND}) - add_custom_command (OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${libname}_doc.i - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../doxy2swig.py -n - ${CMAKE_BINARY_DIR}/xml/${libname}_8h.xml - ${CMAKE_CURRENT_BINARY_DIR}/${libname}_doc.i - DEPENDS ${CMAKE_BINARY_DIR}/xml/${libname}_8h.xml - ) - add_custom_target (${libname}doc_i DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${libname}_doc.i) - add_dependencies (${libname}doc_i doc) - add_dependencies (${SWIG_MODULE_pyupm_grove_REAL_NAME} ${libname}doc_i) - endif () - -endif () - -install (TARGETS ${libname} DESTINATION lib/upm COMPONENT ${libname}) -install (FILES max44000.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 MAX44000") -endif() +upm_module_init() diff --git a/src/nrf24l01/CMakeLists.txt b/src/nrf24l01/CMakeLists.txt index 3fce906b..a91ad597 100644 --- a/src/nrf24l01/CMakeLists.txt +++ b/src/nrf24l01/CMakeLists.txt @@ -1,12 +1,4 @@ set (libname "nrf24l01") +set (libdescription "libupm NRF tx/rx") add_library (nrf24l01 SHARED nrf24l01.cxx) -include_directories (${MAA_INCLUDE_DIR}) -target_link_libraries (nrf24l01 ${MAA_LIBRARIES}) - -install (TARGETS ${libname} DESTINATION lib/upm COMPONENT ${libname}) -install (FILES nrf24l01.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 NRF tx/rx") -endif() +upm_module_init()