diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2017-04-26 20:12:21 +0200 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2017-04-27 15:44:57 +0000 |
| commit | 92e61ed35b6d93094658140c18739032a05e5b5d (patch) | |
| tree | 49f6be482f603897bdfeb055155f9cc33dd2f64d | |
| parent | f045d177f407b5a91d499c59350e168fb30c3505 (diff) | |
| download | wireshark-92e61ed35b6d93094658140c18739032a05e5b5d.tar.gz | |
cmake: cleanup package variable
Do not print a message for a variable if the package does not provide it
(e.g. "Git includes: ").
Change-Id: Ife5e58055c4eb24218b543f52fb7d7882dc1e04e
Reviewed-on: https://code.wireshark.org/review/21359
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
| -rw-r--r-- | CMakeLists.txt | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f0935b7040..10f31e7f72 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -930,14 +930,18 @@ foreach(PACKAGE ${PACKAGELIST}) if (${PACKAGE_VAR}_FOUND OR ${PACKAGE_VAR_UPPER}_FOUND) message(STATUS "${PACKAGE_VAR} FOUND") set(HAVE_LIB${PACKAGE_VAR} 1) - if (NOT DEFINED ${PACKAGE_VAR}_INCLUDE_DIRS) + if (NOT DEFINED ${PACKAGE_VAR}_INCLUDE_DIRS AND ${PACKAGE_VAR}_INCLUDE_DIR) 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}") - message(STATUS "${PACKAGE} libs: ${${PACKAGE_VAR}_LIBRARIES}") - if (${PACKAGE}_DEFINITIONS) + if (${PACKAGE_VAR}_INCLUDE_DIRS) + include_directories(SYSTEM ${${PACKAGE_VAR}_INCLUDE_DIRS}) + message(STATUS "${PACKAGE} includes: ${${PACKAGE_VAR}_INCLUDE_DIRS}") + endif() + if (${PACKAGE_VAR}_LIBRARIES) + list(APPEND WS_ALL_LIBS ${${PACKAGE_VAR}_LIBRARIES}) + message(STATUS "${PACKAGE} libs: ${${PACKAGE_VAR}_LIBRARIES}") + endif() + if (${PACKAGE_VAR}_DEFINITIONS) message(STATUS "${PACKAGE} definitions: ${${PACKAGE_VAR}_DEFINITIONS}") endif() if (${PACKAGE_VAR}_EXECUTABLE) |