summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2016-09-21 15:46:46 (GMT)
committerMichael Palimaka <kensington@gentoo.org>2016-09-21 15:46:46 (GMT)
commitbbd70f646ece7f512eb4964b8884aa399e002ed2 (patch)
treecc672bfd3613afb87be306664dc565a9c9bf48ac
parentd0ff31b443de6b7de21e2e75cd370eefa89b8985 (diff)
Fix regression where INDI version check is ignored
40cf6ad6cd9a8773b78da828daf98069f4777d76 introduced a regression where any version of INDI was accepted, even if it did not meet the minimum version requirement. REVIEW: 128523
-rw-r--r--cmake/modules/FindINDI.cmake6
1 files changed, 3 insertions, 3 deletions
diff --git a/cmake/modules/FindINDI.cmake b/cmake/modules/FindINDI.cmake
index b09b730..404cbfd 100644
--- a/cmake/modules/FindINDI.cmake
+++ b/cmake/modules/FindINDI.cmake
@@ -106,7 +106,7 @@ if(ANDROID)
set(INDI_FOUND FALSE)
endif(INDI_CLIENT_ANDROID_LIBRARIES)
else(ANDROID)
- if (INDI_INCLUDE_DIR AND INDI_LIBRARIES AND (INDI_CLIENT_LIBRARIES OR INDI_CLIENT_QT_LIBRARIES))
+ if (INDI_INCLUDE_DIR AND INDI_LIBRARIES AND (INDI_CLIENT_LIBRARIES OR INDI_CLIENT_QT_LIBRARIES) AND INDI_VERSION_OK)
# If INDI is found we need to make sure on WIN32 we have INDI Client Qt backend otherwise we can't use INDI
if (WIN32)
if (INDI_CLIENT_QT_LIBRARIES)
@@ -117,9 +117,9 @@ else(ANDROID)
else (WIN32)
set(INDI_FOUND TRUE)
endif(WIN32)
- else (INDI_INCLUDE_DIR AND INDI_LIBRARIES AND (INDI_CLIENT_LIBRARIES OR INDI_CLIENT_QT_LIBRARIES))
+ else (INDI_INCLUDE_DIR AND INDI_LIBRARIES AND (INDI_CLIENT_LIBRARIES OR INDI_CLIENT_QT_LIBRARIES) AND INDI_VERSION_OK)
set(INDI_FOUND FALSE)
- endif (INDI_INCLUDE_DIR AND INDI_LIBRARIES AND (INDI_CLIENT_LIBRARIES OR INDI_CLIENT_QT_LIBRARIES))
+ endif (INDI_INCLUDE_DIR AND INDI_LIBRARIES AND (INDI_CLIENT_LIBRARIES OR INDI_CLIENT_QT_LIBRARIES) AND INDI_VERSION_OK)
endif(ANDROID)
if (INDI_FOUND)