alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-03-15 04:57:30 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake: Change from search to check for TPV modules.

Browse Source 
Switch the calls from pkg_search_module to pkg_check_modules
for ozw, bacnet, and modbus.  Check prints out the version when
found.

Signed-off-by: Noel Eck <noel.eck@intel.com>
This commit is contained in:
Noel Eck 2016-05-12 16:24:40 -07:00
parent 1eafab7932
commit a5e3cc89f3
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bacnetmstp/CMakeLists.txt
View File

@ -3,7 +3,7 @@ set (libdescription "upm driver module for BACnet MS/TP devices")
set (module_src ${libname}.cxx device-client.c) set (module_src ${libname}.cxx device-client.c)
set (module_hpp ${libname}.hpp) set (module_hpp ${libname}.hpp)
pkg_search_module(BACNET libbacnet) pkg_check_modules(BACNET libbacnet)
if (BACNET_FOUND) if (BACNET_FOUND)
set (reqlibname "libbacnet") set (reqlibname "libbacnet")
include_directories(${BACNET_INCLUDE_DIRS}) include_directories(${BACNET_INCLUDE_DIRS})

2
src/e50hx/CMakeLists.txt
View File

@ -3,7 +3,7 @@ set (libdescription "upm module for the Veris E50HX (E50H2/E50H5)Energy Meters")
set (module_src ${libname}.cxx) set (module_src ${libname}.cxx)
set (module_hpp ${libname}.hpp) set (module_hpp ${libname}.hpp)
pkg_search_module(BACNET libbacnet) pkg_check_modules(BACNET libbacnet)
if (BACNET_FOUND) if (BACNET_FOUND)
# upm-libbacnetmstp will bring in libbacnet, I hope # upm-libbacnetmstp will bring in libbacnet, I hope
set (reqlibname "upm-bacnetmstp") set (reqlibname "upm-bacnetmstp")

2
src/h803x/CMakeLists.txt
View File

@ -3,7 +3,7 @@ set (libdescription "upm module for the Veris H803X (H8035/H8036)")
set (module_src ${libname}.cxx) set (module_src ${libname}.cxx)
set (module_hpp ${libname}.hpp) set (module_hpp ${libname}.hpp)
pkg_search_module(MODBUS libmodbus) pkg_check_modules(MODBUS libmodbus)
if (MODBUS_FOUND) if (MODBUS_FOUND)
set (reqlibname "libmodbus") set (reqlibname "libmodbus")
include_directories(${MODBUS_INCLUDE_DIRS}) include_directories(${MODBUS_INCLUDE_DIRS})

2
src/hwxpxx/CMakeLists.txt
View File

@ -3,7 +3,7 @@ set (libdescription "upm module for the Veris HWXPXX (HWXPHTX)")
set (module_src ${libname}.cxx) set (module_src ${libname}.cxx)
set (module_hpp ${libname}.hpp) set (module_hpp ${libname}.hpp)
pkg_search_module(MODBUS libmodbus) pkg_check_modules(MODBUS libmodbus)
if (MODBUS_FOUND) if (MODBUS_FOUND)
set (reqlibname "libmodbus") set (reqlibname "libmodbus")
include_directories(${MODBUS_INCLUDE_DIRS}) include_directories(${MODBUS_INCLUDE_DIRS})

2
src/ozw/CMakeLists.txt
View File

@ -3,7 +3,7 @@ set (libdescription "upm module for the OpenZWave library interface")
set (module_src ${libname}.cxx zwNode.cxx) set (module_src ${libname}.cxx zwNode.cxx)
set (module_hpp ${libname}.hpp) set (module_hpp ${libname}.hpp)
pkg_search_module(OPENZWAVE libopenzwave) pkg_check_modules(OPENZWAVE libopenzwave)
if (OPENZWAVE_FOUND) if (OPENZWAVE_FOUND)
set (reqlibname "libopenzwave") set (reqlibname "libopenzwave")
include_directories(${OPENZWAVE_INCLUDE_DIRS}) include_directories(${OPENZWAVE_INCLUDE_DIRS})

2
src/t3311/CMakeLists.txt
View File

@ -3,7 +3,7 @@ set (libdescription "upm module for the Comet System T3311")
set (module_src ${libname}.cxx) set (module_src ${libname}.cxx)
set (module_hpp ${libname}.hpp) set (module_hpp ${libname}.hpp)
pkg_search_module(MODBUS libmodbus) pkg_check_modules(MODBUS libmodbus)
if (MODBUS_FOUND) if (MODBUS_FOUND)
set (reqlibname "libmodbus") set (reqlibname "libmodbus")
include_directories(${MODBUS_INCLUDE_DIRS}) include_directories(${MODBUS_INCLUDE_DIRS})