diff options
author | Ahmad Fatoum <ahmad@a3f.at> | 2017-04-15 13:21:48 +0200 |
---|---|---|
committer | Peter Wu <peter@lekensteyn.nl> | 2017-04-15 15:37:28 +0000 |
commit | e66f9c7b6d597c63fb3960ce61110a25becf8a90 (patch) | |
tree | 0afe02d34c1e2a1c31ce4ad4b88db80bb8b3c5b5 /CMakeLists.txt | |
parent | c2386c5b0114e1fc882ed5396d65697c491b43ed (diff) |
CMake: include PKG_INCLUDE_DIR if PKG_INCLUDE_DIRS is undefined
FindLibXml2.cmake populates LIBXML2_INCLUDE_DIR and leaves
LIBXML2_INCLUDE_DIRS undefined.
Libxml2 inclusion as optional dependency is suggested in Change-Id
I13c0a2f408fb5c21bad7ab3d7971e0fa8ed7d783.
Change-Id: If49c778230e99af4b2ebb97dcb2f8acb4b55aa88
Reviewed-on: https://code.wireshark.org/review/21109
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 16459bf5cf..1320cd2881 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -921,6 +921,9 @@ foreach(PACKAGE ${PACKAGELIST}) if (${PACKAGE_VAR}_FOUND) message(STATUS "${PACKAGE_VAR} FOUND") set(HAVE_LIB${PACKAGE_VAR} 1) + if (NOT DEFINED ${PACKAGE_VAR}_INCLUDE_DIRS) + set(${PACKAGE_VAR}_INCLUDE_DIRS ${${PACKAGE_VAR}_INCLUDE_DIR}) + endif() include_directories(SYSTEM ${${PACKAGE_VAR}_INCLUDE_DIRS}) set(WS_ALL_LIBS ${WS_ALL_LIBS} ${${PACKAGE_VAR}_LIBRARIES}) message(STATUS "${PACKAGE} includes: ${${PACKAGE_VAR}_INCLUDE_DIRS}") |