From a5e3cc89f397ff0e5bcb6d6c1c09ab85a8665190 Mon Sep 17 00:00:00 2001 From: Noel Eck Date: Thu, 12 May 2016 16:24:40 -0700 Subject: [PATCH] cmake: Change from search to check for TPV modules. 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 --- src/bacnetmstp/CMakeLists.txt | 2 +- src/e50hx/CMakeLists.txt | 2 +- src/h803x/CMakeLists.txt | 2 +- src/hwxpxx/CMakeLists.txt | 2 +- src/ozw/CMakeLists.txt | 2 +- src/t3311/CMakeLists.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/bacnetmstp/CMakeLists.txt b/src/bacnetmstp/CMakeLists.txt index e7c7adb9..cf1a5d35 100644 --- a/src/bacnetmstp/CMakeLists.txt +++ b/src/bacnetmstp/CMakeLists.txt @@ -3,7 +3,7 @@ set (libdescription "upm driver module for BACnet MS/TP devices") set (module_src ${libname}.cxx device-client.c) set (module_hpp ${libname}.hpp) -pkg_search_module(BACNET libbacnet) +pkg_check_modules(BACNET libbacnet) if (BACNET_FOUND) set (reqlibname "libbacnet") include_directories(${BACNET_INCLUDE_DIRS}) diff --git a/src/e50hx/CMakeLists.txt b/src/e50hx/CMakeLists.txt index 4e7255a5..609d5864 100644 --- a/src/e50hx/CMakeLists.txt +++ b/src/e50hx/CMakeLists.txt @@ -3,7 +3,7 @@ set (libdescription "upm module for the Veris E50HX (E50H2/E50H5)Energy Meters") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -pkg_search_module(BACNET libbacnet) +pkg_check_modules(BACNET libbacnet) if (BACNET_FOUND) # upm-libbacnetmstp will bring in libbacnet, I hope set (reqlibname "upm-bacnetmstp") diff --git a/src/h803x/CMakeLists.txt b/src/h803x/CMakeLists.txt index bd704064..3c723b03 100644 --- a/src/h803x/CMakeLists.txt +++ b/src/h803x/CMakeLists.txt @@ -3,7 +3,7 @@ set (libdescription "upm module for the Veris H803X (H8035/H8036)") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -pkg_search_module(MODBUS libmodbus) +pkg_check_modules(MODBUS libmodbus) if (MODBUS_FOUND) set (reqlibname "libmodbus") include_directories(${MODBUS_INCLUDE_DIRS}) diff --git a/src/hwxpxx/CMakeLists.txt b/src/hwxpxx/CMakeLists.txt index 59798738..a23b6c5f 100644 --- a/src/hwxpxx/CMakeLists.txt +++ b/src/hwxpxx/CMakeLists.txt @@ -3,7 +3,7 @@ set (libdescription "upm module for the Veris HWXPXX (HWXPHTX)") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -pkg_search_module(MODBUS libmodbus) +pkg_check_modules(MODBUS libmodbus) if (MODBUS_FOUND) set (reqlibname "libmodbus") include_directories(${MODBUS_INCLUDE_DIRS}) diff --git a/src/ozw/CMakeLists.txt b/src/ozw/CMakeLists.txt index 6538fdc2..31fa553e 100644 --- a/src/ozw/CMakeLists.txt +++ b/src/ozw/CMakeLists.txt @@ -3,7 +3,7 @@ set (libdescription "upm module for the OpenZWave library interface") set (module_src ${libname}.cxx zwNode.cxx) set (module_hpp ${libname}.hpp) -pkg_search_module(OPENZWAVE libopenzwave) +pkg_check_modules(OPENZWAVE libopenzwave) if (OPENZWAVE_FOUND) set (reqlibname "libopenzwave") include_directories(${OPENZWAVE_INCLUDE_DIRS}) diff --git a/src/t3311/CMakeLists.txt b/src/t3311/CMakeLists.txt index ac2c5a35..9938378d 100644 --- a/src/t3311/CMakeLists.txt +++ b/src/t3311/CMakeLists.txt @@ -3,7 +3,7 @@ set (libdescription "upm module for the Comet System T3311") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -pkg_search_module(MODBUS libmodbus) +pkg_check_modules(MODBUS libmodbus) if (MODBUS_FOUND) set (reqlibname "libmodbus") include_directories(${MODBUS_INCLUDE_DIRS})