Merge pull request #1599 from allisonvacanti/fix_version_check

alliepiper · web-flow · commit 4bfa8f2f5afd · 2022-01-24T14:20:48.000-05:00
Fix version checks in CMake packages.
diff --git a/dependencies/cub b/dependencies/cub
@@ -1 +1 @@
-Subproject commit d5d009a7238300add814b15ebc02965d18dc7336
+Subproject commit c16f8ff1ad1879d8add7f8cd0600876ce0f264c8
diff --git a/thrust/cmake/thrust-config-version.cmake b/thrust/cmake/thrust-config-version.cmake
@@ -20,11 +20,12 @@ set(PACKAGE_VERSION_EXACT FALSE)
 set(PACKAGE_VERSION_UNSUITABLE FALSE)
 
 if(PACKAGE_VERSION VERSION_GREATER_EQUAL PACKAGE_FIND_VERSION)
-  if(PACKAGE_FIND_VERSION_MAJOR STREQUAL THRUST_VERSION_MAJOR)
+  if(THRUST_VERSION_MAJOR VERSION_EQUAL PACKAGE_FIND_VERSION_MAJOR AND
+     THRUST_VERSION_MINOR VERSION_GREATER_EQUAL PACKAGE_FIND_VERSION_MINOR)
     set(PACKAGE_VERSION_COMPATIBLE TRUE)
   endif()
 
-  if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
+  if(PACKAGE_FIND_VERSION VERSION_EQUAL PACKAGE_VERSION)
     set(PACKAGE_VERSION_EXACT TRUE)
   endif()
 endif()
