tinyxml2 make system changed to meson from CMake
| CMake Error at CMakeLists.txt:124 (find_package):
| By not providing "Findtinyxml2.cmake" in CMAKE_MODULE_PATH this project has
| asked CMake to find a package configuration file provided by "tinyxml2",
| but CMake did not find one.
|
| Could not find a package configuration file provided by "tinyxml2" with any
| of the following names:
|
| tinyxml2Config.cmake
| tinyxml2-config.cmake
|
| Add the installation prefix of "tinyxml2" to CMAKE_PREFIX_PATH or set
| "tinyxml2_DIR" to a directory containing one of the above files. If
| "tinyxml2" provides a separate development package or SDK, be sure it has
| been installed.
|
find_package couldn't find tinyxml2 due to changing of make system from
CMake to meson. Remove find_package and change it to pkg_check_modules.
Fixes: 8e7b46e2350c3689938f309eaca929aada20b5a0 ("subtree updates")
Change-Id: Iac55ca392e1dcfd999340b8811f9206902e1b225
Signed-off-by: Ivan Mikhaylov <fr0st61te@gmail.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e33cec..0393ad1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,6 +72,11 @@
include_directories (SYSTEM ${LIBIPMID_INCLUDE_DIRS})
link_directories (${LIBIPMID_LIBRARY_DIRS})
+
+ pkg_check_modules (TINYXML2 tinyxml2 REQUIRED)
+ include_directories (SYSTEM ${TINYXML2_INCLUDE_DIRS})
+ link_directories (${TINYXML2_LIBRARY_DIRS})
+
endif ()
include_directories (${CMAKE_CURRENT_SOURCE_DIR}/include)
@@ -120,8 +125,6 @@
target_link_libraries (zinteloemcmds -lchannellayer)
target_link_libraries (zinteloemcmds ${OPENSSL_CRYPTO_LIBRARY})
target_link_libraries (zinteloemcmds gpiodcxx)
-
-find_package (tinyxml2 REQUIRED)
target_link_libraries (zinteloemcmds tinyxml2)
install (TARGETS zinteloemcmds DESTINATION lib/ipmid-providers)