Merge pull request #42 from GiulioRomualdi/fix/required_version

Change compatibility of CMake config files from SameMinorVersion to SameMajorVersion
robotology · Jan 18, 2020 · 307f0fe · 307f0fe
2 parents c469a83 + 834e789
commit 307f0fe
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 112 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,7 +27,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED 11)
 
 project(OsqpEigen
   LANGUAGES CXX
-  VERSION 0.5.0)
+  VERSION 0.5.1)
 
 # add GNU dirs
 include(GNUInstallDirs)
@@ -102,7 +102,7 @@ install(TARGETS ${LIBRARY_TARGET_NAME}
 include(InstallBasicPackageFiles)
 install_basic_package_files(${PROJECT_NAME}
   VERSION ${${PROJECT_NAME}_VERSION}
-  COMPATIBILITY SameMinorVersion
+  COMPATIBILITY SameMajorVersion
   VARS_PREFIX ${PROJECT_NAME}
   NO_CHECK_REQUIRED_COMPONENTS_MACRO
   CONFIG_TEMPLATE ${CMAKE_SOURCE_DIR}/cmake/OsqpEigenConfig.cmake.in)

diff --git a/cmake/BasicConfigVersion-SameMinorVersion.cmake.in b/cmake/BasicConfigVersion-SameMinorVersion.cmake.in
diff --git a/cmake/InstallBasicPackageFiles.cmake b/cmake/InstallBasicPackageFiles.cmake
@@ -233,10 +233,6 @@ include(GNUInstallDirs)
 include(CMakePackageConfigHelpers)
 include(CMakeParseArguments)
 
-# custom version of the   write_basic_package_version_file
-# available only from cmake 3.11
-include(WriteBasicConfigVersionFile)
-
 function(INSTALL_BASIC_PACKAGE_FILES _Name)
 
   # TODO check that _Name does not contain "-" characters

diff --git a/cmake/WriteBasicConfigVersionFile.cmake b/cmake/WriteBasicConfigVersionFile.cmake