Merge pull request #314 from mbeutel/feature/fix-269-post

Fix CMake version dependent inconsistency
robotology · Feb 7, 2020 · bb93539 · bb93539
2 parents 597f2b1 + 514719e
commit bb93539
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/modules/InstallBasicPackageFiles.cmake b/modules/InstallBasicPackageFiles.cmake
@@ -676,7 +676,10 @@ ${_compatibility_vars}
   # CMake >= 3.15 already checks for CMAKE_EXPORT_PACKAGE_REGISTRY in `export(PACKAGE)` (cf.
   # cf. https://cmake.org/cmake/help/latest/policy/CMP0090.html), and we effectively back-port
   # this behavior to earlier versions.
-  if(CMAKE_EXPORT_PACKAGE_REGISTRY OR CMAKE_VERSION VERSION_GREATER_EQUAL 3.15)
+  # Note that even never CMake versions may apply old policy behaviors if the consuming project
+  # requires a lower version of CMake (e.g. `cmake_minimum_required(VERSION 3.14)`), so the
+  # check for `CMAKE_EXPORT_PACKAGE_REGISTRY` is necessary for CMake >= 3.15 as well.
+  if(CMAKE_EXPORT_PACKAGE_REGISTRY)
     export(PACKAGE ${_Name})
   endif()