Raspberries/upm
Public Access
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
7a5c8a6cb359b884d0567bb27a7664e4f8886ed6
upm/src/ozw/CMakeLists.txt

17 lines
817 B
CMake
Raw Normal View History

ozw: Initial implementation This module was developed using the OpenZWave library (v1.3): http://www.openzwave.com/ It was developed using a collection of devices (switches and a multi-sensor) connected via an Aeon Z-Stick Gen5 USB dongle. It can be used to query (and, where appropriate, set) Values on Nodes connected to the ZWave network. Checks are made in src/ozw/CMakeLists.txt to ensure that the libopenzwave library is installed (via pkg-config). If not present, then neither the module, nor the example will be built. Signed-off-by: Jon Trulson <jtrulson@ics.com> Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
2015-10-23 18:00:33 -06:00
if (OPENZWAVE_FOUND)
cmake: Dependency refactoring for includes and libs This commit attempts to use a more cmake-friendly approach when handling inter-target dependencies. A combination of macros and include_directories usage provided overzealous compile -I/blah entries which equates to large catch-all build commands. For example, the last CXX target contains include directories for nearly all preceeding targets (~190). Library dependencies were also often wrong or missing. * Removed nearly all used of include_directories (swig cmake commands still appear to need these for generating the swig command line) * Updated usage of target_link_libraries in upm_module_init, also changed to using target_include_directories per target. This greatly simplifies upm/mixed_module_init usage for libraries which depend on other libraries (in this project). example (src/tb7300/CMakeLists.txt) old: # upm-libbacnetmstp will bring in libbacnet, I hope set (reqlibname "upm-bacnetmstp") include_directories(${BACNET_INCLUDE_DIRS}) include_directories("../bacnetmstp") upm_module_init() upm_target_link_libraries(${libname} bacnetmstp) new: upm_module_init(bacnetmstp) The reason here, is that tb7300 depends on bacnetmstp, which depends on BACNET includes/libs, so tb7300 gets the headers and libraries transitively via its dependency on bacnetmstp. * Updated pkg-config .pc file generation flow to reflect changes with dependencies. * Create a real target for the interfaces (CXX abstract sensor classes). Renamed the directory from 'upm/src/upm' to 'upm/src/interfaces' Also changed the install location of the interface headers to include/upm/interfaces. Updated interface header usage to reflect this. * Updated a few sensor libs to use fwd declarations for mraa. Ideally the UPM libs would do more of this which eases the burden on anyone building on top of the sensor libraries since they would not need to know about mraa headers. * Fixed examples which use symbols not defined in local includes Signed-off-by: Noel Eck <noel.eck@intel.com>
2017-01-30 18:14:48 -08:00
set (libname "ozw")
set (libdescription "Module for the OpenZWave library interface")
set (module_src ${libname}.cxx zwNode.cxx ozwinterface.cxx ozwdump.cxx aeotecss6.cxx aeotecsdg2.cxx aeotecdw2e.cxx aeotecdsb09104.cxx tzemt400.cxx)
set (module_hpp ${libname}.hpp ozwinterface.hpp ozwdump.hpp aeotecss6.hpp aeotecsdg2.hpp aeotecdw2e.hpp aeotecdsb09104.hpp tzemt400.hpp)
ozw: Initial implementation This module was developed using the OpenZWave library (v1.3): http://www.openzwave.com/ It was developed using a collection of devices (switches and a multi-sensor) connected via an Aeon Z-Stick Gen5 USB dongle. It can be used to query (and, where appropriate, set) Values on Nodes connected to the ZWave network. Checks are made in src/ozw/CMakeLists.txt to ensure that the libopenzwave library is installed (via pkg-config). If not present, then neither the module, nor the example will be built. Signed-off-by: Jon Trulson <jtrulson@ics.com> Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
2015-10-23 18:00:33 -06:00
set (reqlibname "libopenzwave")
cmake: Dependency refactoring for includes and libs This commit attempts to use a more cmake-friendly approach when handling inter-target dependencies. A combination of macros and include_directories usage provided overzealous compile -I/blah entries which equates to large catch-all build commands. For example, the last CXX target contains include directories for nearly all preceeding targets (~190). Library dependencies were also often wrong or missing. * Removed nearly all used of include_directories (swig cmake commands still appear to need these for generating the swig command line) * Updated usage of target_link_libraries in upm_module_init, also changed to using target_include_directories per target. This greatly simplifies upm/mixed_module_init usage for libraries which depend on other libraries (in this project). example (src/tb7300/CMakeLists.txt) old: # upm-libbacnetmstp will bring in libbacnet, I hope set (reqlibname "upm-bacnetmstp") include_directories(${BACNET_INCLUDE_DIRS}) include_directories("../bacnetmstp") upm_module_init() upm_target_link_libraries(${libname} bacnetmstp) new: upm_module_init(bacnetmstp) The reason here, is that tb7300 depends on bacnetmstp, which depends on BACNET includes/libs, so tb7300 gets the headers and libraries transitively via its dependency on bacnetmstp. * Updated pkg-config .pc file generation flow to reflect changes with dependencies. * Create a real target for the interfaces (CXX abstract sensor classes). Renamed the directory from 'upm/src/upm' to 'upm/src/interfaces' Also changed the install location of the interface headers to include/upm/interfaces. Updated interface header usage to reflect this. * Updated a few sensor libs to use fwd declarations for mraa. Ideally the UPM libs would do more of this which eases the burden on anyone building on top of the sensor libraries since they would not need to know about mraa headers. * Fixed examples which use symbols not defined in local includes Signed-off-by: Noel Eck <noel.eck@intel.com>
2017-01-30 18:14:48 -08:00
upm_module_init(${OPENZWAVE_LIBRARIES})
target_include_directories(${libname} PUBLIC ${OPENZWAVE_INCLUDE_DIRS})
Wno-unknown-pragmas: Fixed all unknown pragmas This commit addresses all warnings emitted from -Wno-unknown-pragmas in the C++ src. Signed-off-by: Noel Eck <noel.eck@intel.com>
2016-11-02 22:57:38 -07:00
# openzwave/aes/aes.h has unknown pragmas, disable warning -Wunknown-pragmas
compiler_flag_supported(CXX is_supported -Wno-unknown-pragmas)
if (is_supported)
cxx_warnings: Misc changes to enable Werror * CMake option to enable -Werror as default * Change to make sure all cxx examples have correct target name * Added PUBLIC CXX compiler flags to ads1x15 and ozw targets to work around compiler warnings * Renamed cmake variable for compiler warnings Signed-off-by: Noel Eck <noel.eck@intel.com>
2016-11-03 16:10:35 -07:00
target_compile_options(${libname} PUBLIC -Wno-unknown-pragmas)
Wno-unknown-pragmas: Fixed all unknown pragmas This commit addresses all warnings emitted from -Wno-unknown-pragmas in the C++ src. Signed-off-by: Noel Eck <noel.eck@intel.com>
2016-11-02 22:57:38 -07:00
endif (is_supported)
ozw: Initial implementation This module was developed using the OpenZWave library (v1.3): http://www.openzwave.com/ It was developed using a collection of devices (switches and a multi-sensor) connected via an Aeon Z-Stick Gen5 USB dongle. It can be used to query (and, where appropriate, set) Values on Nodes connected to the ZWave network. Checks are made in src/ozw/CMakeLists.txt to ensure that the libopenzwave library is installed (via pkg-config). If not present, then neither the module, nor the example will be built. Signed-off-by: Jon Trulson <jtrulson@ics.com> Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
2015-10-23 18:00:33 -06:00
endif ()
Reference in New Issue Copy Permalink