From 4fad2eac0a3741df3d9c44b791f9163b74aa7b07 Mon Sep 17 00:00:00 2001 From: Lars Melchior Date: Thu, 25 Mar 2021 18:24:44 +0100 Subject: [PATCH] remove option consistency check (#240) --- README.md | 1 - cmake/CPM.cmake | 19 ++++--------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 8cdc618..82544b7 100644 --- a/README.md +++ b/README.md @@ -157,7 +157,6 @@ The most notable features are: - A simpler to use API - Version checking: CPM.cmake will check the version number of any added dependency and omit a warning if another dependency requires a more recent version. -- Options: any Options passed to a dependency are stored and compared on later use, so if another dependency tries to add an existing dependency with incompatible options a warning will be emitted to the user. - Offline builds: CPM.cmake will override CMake's download and update commands, which allows new builds to be configured while offline if all dependencies [are available locally](#cpm_source_cache). - Automatic shallow clone: if a version tag (e.g. `v2.2.0`) is provided and `CPM_SOURCE_CACHE` is used, CPM.cmake will perform a shallow clone of the dependency, which should be significantly faster while using less storage than a full clone. - Overridable: all `CPMAddPackage` can be configured to use `find_package` by setting a [CMake flag](#cpm_use_local_packages), making it easy to integrate into projects that may require local versioning through the system's package manager. diff --git a/cmake/CPM.cmake b/cmake/CPM.cmake index e058036..85e727e 100644 --- a/cmake/CPM.cmake +++ b/cmake/CPM.cmake @@ -246,7 +246,7 @@ function(CPMFindPackage) return() endif() - cpm_check_if_package_already_added(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}" "${CPM_ARGS_OPTIONS}") + cpm_check_if_package_already_added(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}") if(CPM_PACKAGE_ALREADY_ADDED) cpm_export_variables(${CPM_ARGS_NAME}) return() @@ -262,7 +262,7 @@ function(CPMFindPackage) endfunction() # checks if a package has been added before -function(cpm_check_if_package_already_added CPM_ARGS_NAME CPM_ARGS_VERSION CPM_ARGS_OPTIONS) +function(cpm_check_if_package_already_added CPM_ARGS_NAME CPM_ARGS_VERSION) if("${CPM_ARGS_NAME}" IN_LIST CPM_PACKAGES) CPMGetPackageVersion(${CPM_ARGS_NAME} CPM_PACKAGE_VERSION) if("${CPM_PACKAGE_VERSION}" VERSION_LESS "${CPM_ARGS_VERSION}") @@ -271,17 +271,6 @@ function(cpm_check_if_package_already_added CPM_ARGS_NAME CPM_ARGS_VERSION CPM_A "${CPM_INDENT} requires a newer version of ${CPM_ARGS_NAME} (${CPM_ARGS_VERSION}) than currently included (${CPM_PACKAGE_VERSION})." ) endif() - if(CPM_ARGS_OPTIONS) - foreach(OPTION ${CPM_ARGS_OPTIONS}) - cpm_parse_option(${OPTION}) - if(NOT "${${OPTION_KEY}}" STREQUAL "${OPTION_VALUE}") - message( - WARNING - "${CPM_INDENT} ignoring package option for ${CPM_ARGS_NAME}: ${OPTION_KEY} = ${OPTION_VALUE} (${${OPTION_KEY}})" - ) - endif() - endforeach() - endif() cpm_get_fetch_properties(${CPM_ARGS_NAME}) set(${CPM_ARGS_NAME}_ADDED NO) set(CPM_PACKAGE_ALREADY_ADDED @@ -466,7 +455,7 @@ function(CPMAddPackage) endif() # Check if package has been added before - cpm_check_if_package_already_added(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}" "${CPM_ARGS_OPTIONS}") + cpm_check_if_package_already_added(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}") if(CPM_PACKAGE_ALREADY_ADDED) cpm_export_variables(${CPM_ARGS_NAME}) return() @@ -493,7 +482,7 @@ function(CPMAddPackage) CPMAddPackage(${declaration}) cpm_export_variables(${CPM_ARGS_NAME}) # checking again to ensure version and option compatibility - cpm_check_if_package_already_added(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}" "${CPM_ARGS_OPTIONS}") + cpm_check_if_package_already_added(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}") return() endif()