diff options
| -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) |