commit 5480ef620b4e3f7035b798dde31ab341adf2a2d8
author Vernon Mauery <vernon.mauery@linux.intel.com> Wed Mar 20 13:43:11 2019 -0700
committer James Feist <james.feist@linux.intel.com> Tue Mar 26 11:47:00 2019 -0700
tree 77a96939926c44c8c69b90617b5b5d52c8c33137
parent 9e7e17a5a688a5e54e8fa4ab147ac21b8b97b6c8

Use the libipmid utils implementation

Do not copy the utils.cpp/utils.hpp code, link against libipmid, which
now exports those symbols for ipmi providers to use.

Change-Id: I1c849e0aa79457837ddd89ef23826b6a3cb51e35
Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com>
Signed-off-by: James Feist <james.feist@linux.intel.com>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e733fad..d1c2d6d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,7 @@
     link_directories (${CMAKE_BINARY_DIR}/sdbusplus-src/.libs)
     include_directories (${CMAKE_BINARY_DIR}/phosphor-logging-src)
     link_directories (${CMAKE_BINARY_DIR}/phosphor-logging-src/.libs)
-
+    include_directories (${CMAKE_BINARY_DIR}/phosphor-ipmi-host/include)
     include_directories (${CMAKE_BINARY_DIR}) # link_directories
                                               # (${CMAKE_BINARY_DIR}/sdbusplus-
                                               # src/.libs)
@@ -44,6 +44,7 @@
 if (YOCTO)
     find_package (PkgConfig REQUIRED)
     pkg_check_modules (LOGGING phosphor-logging REQUIRED)
+    pkg_check_modules (LIBIPMID libipmid REQUIRED)
     include_directories (${LOGGING_INCLUDE_DIRS})
     link_directories (${LOGGING_LIBRARY_DIRS})
 
@@ -61,17 +62,20 @@
     add_executable (runSensorTests ${SENSOR_TEST_SRC})
     add_test (NAME test_sensorcommands COMMAND runSensorTests)
     target_link_libraries (runSensorTests ${GTEST_BOTH_LIBRARIES}
-                           ${CMAKE_THREAD_LIBS_INIT}
-                           phosphor_logging sdbusplus -lsystemd)
+                           ${CMAKE_THREAD_LIBS_INIT} phosphor_logging sdbusplus
+                           -lsystemd)
 endif ()
 
 include_directories (${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 add_library (zinteloemcmds
-             SHARED src/oemcommands.cpp src/utils.cpp src/sensorcommands.cpp
+             SHARED src/oemcommands.cpp src/sensorcommands.cpp
              src/storagecommands.cpp)
 set_target_properties (zinteloemcmds PROPERTIES VERSION "0.1.0")
 set_target_properties (zinteloemcmds PROPERTIES SOVERSION "0")
+if (YOCTO)
+    target_link_libraries (zinteloemcmds ipmid)
+endif ()
 target_link_libraries (zinteloemcmds sdbusplus)
 target_link_libraries (zinteloemcmds phosphor_logging)