set EXCLUDE_FROM_ALL as an optional flag

respect DOWNLOAD_ONLY flag
add dependencies using EXCLUDE_FROM_ALL flag
2025-11-18 07:07:47 -05:00 · 2021-02-15 13:45:16 +01:00 · 2021-02-15 13:11:51 +01:00 · 2021-02-15 13:04:32 +01:00
36 changed files with 260 additions and 718 deletions
--- a/.cmake-format
+++ b/.cmake-format
@@ -33,8 +33,6 @@ parse:
        DOWNLOAD_NO_EXTRACT: 1
        HTTP_USERNAME: 1
        HTTP_PASSWORD: 1
-        EXCLUDE_FROM_ALL: 1
-        SOURCE_SUBDIR: 1
        OPTIONS: +
    cpmfindpackage:
      pargs:
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,7 +36,8 @@ before_install:
  # Update compilers
  - eval "${MATRIX_EVAL}"
  - echo "CC=$CC CXX=$CXX"
-  - wget -O cmake.sh https://github.com/Kitware/CMake/releases/download/v3.20.3/cmake-3.20.3-linux-x86_64.sh
+  # Install a supported cmake version (>= 3.14)
+  - wget -O cmake.sh https://cmake.org/files/v3.14/cmake-3.14.0-Linux-x86_64.sh
  - sudo sh cmake.sh --skip-license --exclude-subdir --prefix=/usr/local
  - export PATH=/usr/local/bin:$PATH
  - cmake --version
--- a/README.md
+++ b/README.md
@@ -27,9 +27,9 @@ For everything else, the targets can be created manually after the dependency ha

 ## Usage

-After `CPM.cmake` has been [added](#adding-cpm) to your project, the function `CPMAddPackage` can be used to fetch and configure a dependency.
+After `CPM.cmake` has been [added](#adding-cpm) to your project, the function `CPMAddPackage` or `CPMFindPackage` can be used to fetch and configure a dependency.
 Afterwards, any targets defined in the dependency can be used directly.
-`CPMAddPackage` takes the following named parameters.
+`CPMFindPackage` and `CPMAddPackage` take the following named parameters.

 ```cmake
 CPMAddPackage(
@@ -43,44 +43,18 @@ CPMAddPackage(

 The origin may be specified by a `GIT_REPOSITORY`, but other sources, such as direct URLs, are [also supported](https://cmake.org/cmake/help/v3.11/module/ExternalProject.html#external-project-definition).
 If `GIT_TAG` hasn't been explicitly specified it defaults to `v(VERSION)`, a common convention for git projects.
-On the other hand, if `VERSION` hasn't been explicitly specified, CPM can automatically identify the version from the git tag in some common cases.
-`GIT_TAG` can also be set to a specific commit or a branch name such as `master`, however this isn't recommended, as such packages will only be updated when the cache is cleared.
+On the other hand, if `VERSION` hasn't been explicitly specified, CPM can automatically identify the version from the git tag in some common cases. 
+`GIT_TAG` can also be set to a specific commit or a branch name such as `master` to always download the most recent version.
+The optional argument `FIND_PACKAGE_ARGUMENTS` can be specified to a string of parameters that will be passed to `find_package` if enabled (see below).

-If an additional optional parameter `EXCLUDE_FROM_ALL` is set to a truthy value, then any targets defined inside the dependency won't be built by default. See the [CMake docs](https://cmake.org/cmake/help/latest/prop_tgt/EXCLUDE_FROM_ALL.html) for details.
-
-A single-argument compact syntax is also supported:
-
-```cmake
-# A git package from a given uri with a version
-CPMAddPackage("uri@version")
-# A git package from a given uri with a git tag or commit hash
-CPMAddPackage("uri#tag")
-# A git package with both version and tag provided
-CPMAddPackage("uri@version#tag")
-```
-
-In the shorthand syntax if the URI is of the form `gh:user/name`, it is interpreted as GitHub URI and converted to `https://github.com/user/name.git`. If the URI is of the form `gl:user/name`, it is interpreted as a [GitLab](https://gitlab.com/explore/) URI and converted to `https://gitlab.com/user/name.git`. If the URI is of the form `bb:user/name`, it is interpreted as a [Bitbucket](https://bitbucket.org/) URI and converted to `https://bitbucket.org/user/name.git`. Otherwise the URI used verbatim as a git URL. All packages added using the shorthand syntax will be added using the [EXCLUDE_FROM_ALL](https://cmake.org/cmake/help/latest/prop_tgt/EXCLUDE_FROM_ALL.html) flag.
-
-The single-argument syntax also works for URLs:
-
-```cmake
-# An archive package from a given url. The version is inferred
-CPMAddPackage("https://example.com/my-package-1.2.3.zip")
-# An archive package from a given url with an MD5 hash provided
-CPMAddPackage("https://example.com/my-package-1.2.3.zip#MD5=68e20f674a48be38d60e129f600faf7d")
-# An archive package from a given url. The version is explicitly given
-CPMAddPackage("https://example.com/my-package.zip@1.2.3")
-```
-
-After calling `CPMAddPackage`, the following variables are defined in the local scope, where `<dependency>` is the name of the dependency.
+After calling `CPMAddPackage` or `CPMFindPackage`, the following variables are defined in the local scope, where `<dependency>` is the name of the dependency.

 - `<dependency>_SOURCE_DIR` is the path to the source of the dependency.
 - `<dependency>_BINARY_DIR` is the path to the build directory of the dependency.
 - `<dependency>_ADDED` is set to `YES` if the dependency has not been added before, otherwise it is set to `NO`.

-For using CPM.cmake projects with external package managers, such as conan or vcpkg, setting the variable [`CPM_USE_LOCAL_PACKAGES`](#options) will make CPM.cmake try to add a package through `find_package` first, and add it from source if it doesn't succeed.
-
-In rare cases, this behaviour may be desirable by default. The function `CPMFindPackage` will try to find a local dependency via CMake's `find_package` and fallback to `CPMAddPackage`, if the dependency is not found.
+The difference between `CPMFindPackage` and `CPMAddPackage` is that `CPMFindPackage` will try to find a local dependency via CMake's `find_package` and fallback to `CPMAddPackage` if the dependency is not found.
+This behaviour can be also modified globally via [CPM options](#options).

 ## Full CMakeLists Example

@@ -95,7 +69,12 @@ add_executable(tests tests.cpp)

 # add dependencies
 include(cmake/CPM.cmake)
-CPMAddPackage("gh:catchorg/Catch2@2.5.0")
+
+CPMAddPackage(
+  NAME Catch2
+  GITHUB_REPOSITORY catchorg/Catch2
+  VERSION 2.5.0
+)

 # link dependencies
 target_link_libraries(tests Catch2)
@@ -133,7 +112,7 @@ Dependencies using CPM will automatically use the updated script of the outermos
 ## Limitations

 - **No pre-built binaries** For every new build directory, all dependencies are initially downloaded and built from scratch. To avoid extra downloads it is recommend to set the [`CPM_SOURCE_CACHE`](#CPM_SOURCE_CACHE) environmental variable. Using a caching compiler such as [ccache](https://github.com/TheLartians/Ccache.cmake) can drastically reduce build time.
- **Dependent on good CMakeLists** Many libraries do not have CMakeLists that work well for subprojects. Luckily this is slowly changing, however, until then, some manual configuration may be required (see the snippets [below](#snippets) for examples). For best practices on preparing projects for CPM, see the [wiki](https://github.com/cpm-cmake/CPM.cmake/wiki/Preparing-projects-for-CPM.cmake).
+- **Dependent on good CMakeLists** Many libraries do not have CMakeLists that work well for subprojects. Luckily this is slowly changing, however, until then, some manual configuration may be required (see the snippets [below](#snippets) for examples). For best practices on preparing projects for CPM, see the [wiki](https://github.com/cpm-cmake/CPM.cmake/wiki/Preparing-projects-for-CPM.cmake). 
 - **First version used** In diamond-shaped dependency graphs (e.g. `A` depends on `C`@1.1 and `B`, which itself depends on `C`@1.2 the first added dependency will be used (in this case `C`@1.1). In this case, B requires a newer version of `C` than `A`, so CPM will emit a warning. This can be easily resolved by adding a new version of the dependency in the outermost project, or by introducing a [package lock file](#package-lock).

 For projects with more complex needs and where an extra setup step doesn't matter, it may be worth to check out an external C++ package manager such as [vcpkg](https://github.com/microsoft/vcpkg), [conan](https://conan.io) or [hunter](https://github.com/ruslo/hunter).
@@ -156,14 +135,15 @@ CPM.cmake is a wrapper for CMake's FetchContent module and adds a number of feat
 The most notable features are:

 - A simpler to use API
- Version checking: CPM.cmake will check the version number of any added dependency and emit a warning if another dependency requires a more recent version.
+- 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.
 - [Package lock files](#package-lock) for easier transitive dependency management.
 - Dependencies can be overridden [per-build](#local-package-override) using CMake CLI parameters.

-ExternalProject works similarly as FetchContent, however waits with adding dependencies until build time.
+ExternalProject works similarly as FetchContent, however waits with adding dependencies until build time. 
 This has a quite a few disadvantages, especially as it makes using custom toolchains / cross-compiling very difficult and can lead to problems with nested dependencies.

 ## Options
@@ -194,13 +174,11 @@ CPM can be configured to use `find_package` to search for locally installed depe
 If the option `CPM_LOCAL_PACKAGES_ONLY` is set, CPM will emit an error if the dependency is not found locally.
 These options can also be set as environmental variables.

-In the case that `find_package` requires additional arguments, the parameter `FIND_PACKAGE_ARGUMENTS` may be specified in the `CPMAddPackage` call. The value of this parameter will be forwarded to `find_package`.
-
 ## Local package override

 Library developers are often in the situation where they work on a locally checked out dependency at the same time as on a consumer project.
 It is possible to override the consumer's dependency with the version by supplying the CMake option `CPM_<dependency name>_SOURCE` set to the absolute path of the local library.
-For example, to use the local version of the dependency `Dep` at the path `/path/to/dep`, the consumer can be built with the following command.
+For example, to use the local version of the dependency `Dep` at the path `/path/to/dep`, the consumer can be built with the following command. 

 ```bash
 cmake -Bbuild -DCPM_Dep_SOURCE=/path/to/dep
@@ -227,7 +205,7 @@ See the [wiki](https://github.com/cpm-cmake/CPM.cmake/wiki/Package-lock) for mor

 ## Built with CPM.cmake

-Some amazing projects that are built using the CPM.cmake package manager.
+Some amazing projects that are built using the CPM.cmake package manager. 
 If you know others, feel free to add them here through a PR.

 <table>
@@ -267,48 +245,50 @@ See the [wiki](https://github.com/cpm-cmake/CPM.cmake/wiki/More-Snippets) for mo
 ### [Catch2](https://github.com/catchorg/Catch2)

 ```cmake
-CPMAddPackage("gh:catchorg/Catch2@2.5.0")
+CPMAddPackage(
+  NAME Catch2
+  GITHUB_REPOSITORY catchorg/Catch2
+  VERSION 2.5.0
+)
 ```

 ### [Boost (via boost-cmake)](https://github.com/Orphis/boost-cmake)

 ```CMake
-# boost-cmake currently doesn't tag versions, so we use the according boost version
-CPMAddPackage("gh:Orphis/boost-cmake#7f97a08b64bd5d2e53e932ddf80c40544cf45edf@1.71.0")
-```
-
-### [Yaml-cpp](https://github.com/jbeder/yaml-cpp)
-
-```CMake
-# as the tag is in an unusual format, we need to explicitly specify the version
-CPMAddPackage("gh:jbeder/yaml-cpp#yaml-cpp-0.6.3@0.6.3")
-```
-
-### [Range-v3](https://github.com/ericniebler/range-v3)
-
-```Cmake
-CPMAddPackage("gh:ericniebler/range-v3#0.11.0")
-```
-
-### [nlohmann/json](https://github.com/nlohmann/json)
-
-```cmake
 CPMAddPackage(
-  NAME nlohmann_json
-  VERSION 3.9.1
-  OPTIONS 
-    "JSON_BuildTests OFF"
+  NAME boost-cmake
+  GITHUB_REPOSITORY Orphis/boost-cmake
+  VERSION 1.67.0
 )
 ```

 ### [cxxopts](https://github.com/jarro2783/cxxopts)

 ```cmake
-# the install option has to be explicitly set to allow installation
 CPMAddPackage(
+  NAME cxxopts
  GITHUB_REPOSITORY jarro2783/cxxopts
-  VERSION 2.2.1
-  OPTIONS "CXXOPTS_BUILD_EXAMPLES NO" "CXXOPTS_BUILD_TESTS NO" "CXXOPTS_ENABLE_INSTALL YES"
+  VERSION 2.2.0
+  OPTIONS
+    "CXXOPTS_BUILD_EXAMPLES Off"
+    "CXXOPTS_BUILD_TESTS Off"
+)
+```
+
+### [Yaml-cpp](https://github.com/jbeder/yaml-cpp)
+
+```CMake
+CPMAddPackage(
+  NAME yaml-cpp
+  GITHUB_REPOSITORY jbeder/yaml-cpp
+  # 0.6.2 uses deprecated CMake syntax
+  VERSION 0.6.3
+  # 0.6.3 is not released yet, so use a recent commit
+  GIT_TAG 012269756149ae99745b6dafefd415843d7420bb 
+  OPTIONS
+    "YAML_CPP_BUILD_TESTS Off"
+    "YAML_CPP_BUILD_CONTRIB Off"
+    "YAML_CPP_BUILD_TOOLS Off"
 )
 ```

@@ -318,13 +298,48 @@ CPMAddPackage(
 CPMAddPackage(
  NAME benchmark
  GITHUB_REPOSITORY google/benchmark
-  VERSION 1.5.2
-  OPTIONS "BENCHMARK_ENABLE_TESTING Off"
+  VERSION 1.4.1
+  OPTIONS
+    "BENCHMARK_ENABLE_TESTING Off"
 )

-if(benchmark_ADDED)
-  # enable c++11 to avoid compilation errors
-  set_target_properties(benchmark PROPERTIES CXX_STANDARD 11)
+if (benchmark_ADDED)
+  # compile with C++17
+  set_target_properties(benchmark PROPERTIES CXX_STANDARD 17)
+endif()
+```
+
+### [nlohmann/json](https://github.com/nlohmann/json)
+
+```cmake
+CPMAddPackage(
+  NAME nlohmann_json
+  VERSION 3.6.1  
+  # the git repo is incredibly large, so we download the archived include directory
+  URL https://github.com/nlohmann/json/releases/download/v3.6.1/include.zip
+  URL_HASH SHA256=69cc88207ce91347ea530b227ff0776db82dcb8de6704e1a3d74f4841bc651cf
+)
+
+if (nlohmann_json_ADDED)
+  add_library(nlohmann_json INTERFACE IMPORTED)
+  target_include_directories(nlohmann_json INTERFACE ${nlohmann_json_SOURCE_DIR})
+endif()
+```
+
+### [Range-v3](https://github.com/ericniebler/range-v3)
+
+```Cmake
+CPMAddPackage(
+  NAME range-v3
+  URL https://github.com/ericniebler/range-v3/archive/0.5.0.zip
+  VERSION 0.5.0
+  # the range-v3 CMakeLists screws with configuration options
+  DOWNLOAD_ONLY True
+)
+
+if(range-v3_ADDED) 
+  add_library(range-v3 INTERFACE IMPORTED)
+  target_include_directories(range-v3 INTERFACE "${range-v3_SOURCE_DIR}/include")
 endif()
 ```

--- a/cmake/CPM.cmake
+++ b/cmake/CPM.cmake
@@ -132,64 +132,7 @@ if(NOT CPM_DONT_CREATE_PACKAGE_LOCK)
 endif()

 include(FetchContent)
-
-# Try to infer package name from git repository uri (path or url)
-function(cpm_package_name_from_git_uri URI RESULT)
-  if("${URI}" MATCHES "([^/:]+)/?.git/?$")
-    set(${RESULT}
-        ${CMAKE_MATCH_1}
-        PARENT_SCOPE
-    )
-  else()
-    unset(${RESULT} PARENT_SCOPE)
-  endif()
-endfunction()
-
-# Try to infer package name and version from a url
-function(cpm_package_name_and_ver_from_url url outName outVer)
-  if(url MATCHES "[/\\?]([a-zA-Z0-9_\\.-]+)\\.(tar|tar\\.gz|tar\\.bz2|zip|ZIP)(\\?|/|$)")
-    # We matched an archive
-    set(filename "${CMAKE_MATCH_1}")
-
-    if(filename MATCHES "([a-zA-Z0-9_\\.-]+)[_-]v?(([0-9]+\\.)*[0-9]+[a-zA-Z0-9]*)")
-      # We matched <name>-<version> (ie foo-1.2.3)
-      set(${outName}
-          "${CMAKE_MATCH_1}"
-          PARENT_SCOPE
-      )
-      set(${outVer}
-          "${CMAKE_MATCH_2}"
-          PARENT_SCOPE
-      )
-    elseif(filename MATCHES "(([0-9]+\\.)+[0-9]+[a-zA-Z0-9]*)")
-      # We couldn't find a name, but we found a version
-      #
-      # In many cases (which we don't handle here) the url would look something like
-      # `irrelevant/ACTUAL_PACKAGE_NAME/irrelevant/1.2.3.zip`. In such a case we can't possibly
-      # distinguish the package name from the irrelevant bits. Moreover if we try to match the
-      # package name from the filename, we'd get bogus at best.
-      unset(${outName} PARENT_SCOPE)
-      set(${outVer}
-          "${CMAKE_MATCH_1}"
-          PARENT_SCOPE
-      )
-    else()
-      # Boldly assume that the file name is the package name.
-      #
-      # Yes, something like `irrelevant/ACTUAL_NAME/irrelevant/download.zip` will ruin our day, but
-      # such cases should be quite rare. No popular service does this... we think.
-      set(${outName}
-          "${filename}"
-          PARENT_SCOPE
-      )
-      unset(${outVer} PARENT_SCOPE)
-    endif()
-  else()
-    # No ideas yet what to do with non-archives
-    unset(${outName} PARENT_SCOPE)
-    unset(${outVer} PARENT_SCOPE)
-  endif()
-endfunction()
+include(CMakeParseArguments)

 # Initialize logging prefix
 if(NOT CPM_INDENT)
@@ -246,7 +189,7 @@ function(CPMFindPackage)
    return()
  endif()

-  cpm_check_if_package_already_added(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}")
+  cpm_check_if_package_already_added(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}" "${CPM_ARGS_OPTIONS}")
  if(CPM_PACKAGE_ALREADY_ADDED)
    cpm_export_variables(${CPM_ARGS_NAME})
    return()
@@ -262,7 +205,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)
+function(cpm_check_if_package_already_added CPM_ARGS_NAME CPM_ARGS_VERSION CPM_ARGS_OPTIONS)
  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,6 +214,17 @@ function(cpm_check_if_package_already_added CPM_ARGS_NAME CPM_ARGS_VERSION)
          "${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
@@ -286,83 +240,10 @@ function(cpm_check_if_package_already_added CPM_ARGS_NAME CPM_ARGS_VERSION)
  endif()
 endfunction()

-# Parse the argument of CPMAddPackage in case a single one was provided and convert it to a list of
-# arguments which can then be parsed idiomatically. For example gh:foo/bar@1.2.3 will be converted
-# to: GITHUB_REPOSITORY;foo/bar;VERSION;1.2.3
-function(cpm_parse_add_package_single_arg arg outArgs)
-  # Look for a scheme
-  if("${arg}" MATCHES "^([a-zA-Z]+):(.+)$")
-    string(TOLOWER "${CMAKE_MATCH_1}" scheme)
-    set(uri "${CMAKE_MATCH_2}")
-
-    # Check for CPM-specific schemes
-    if(scheme STREQUAL "gh")
-      set(out "GITHUB_REPOSITORY;${uri}")
-      set(packageType "git")
-    elseif(scheme STREQUAL "gl")
-      set(out "GITLAB_REPOSITORY;${uri}")
-      set(packageType "git")
-    elseif(scheme STREQUAL "bb")
-      set(out "BITBUCKET_REPOSITORY;${uri}")
-      set(packageType "git")
-      # A CPM-specific scheme was not found. Looks like this is a generic URL so try to determine
-      # type
-    elseif(arg MATCHES ".git/?(@|#|$)")
-      set(out "GIT_REPOSITORY;${arg}")
-      set(packageType "git")
-    else()
-      # Fall back to a URL
-      set(out "URL;${arg}")
-      set(packageType "archive")
-
-      # We could also check for SVN since FetchContent supports it, but SVN is so rare these days.
-      # We just won't bother with the additional complexity it will induce in this function. SVN is
-      # done by multi-arg
-    endif()
-  else()
-    if(arg MATCHES ".git/?(@|#|$)")
-      set(out "GIT_REPOSITORY;${arg}")
-      set(packageType "git")
-    else()
-      # Give up
-      message(FATAL_ERROR "CPM: Can't determine package type of '${arg}'")
-    endif()
-  endif()
-
-  # For all packages we interpret @... as version. Only replace the last occurence. Thus URIs
-  # containing '@' can be used
-  string(REGEX REPLACE "@([^@]+)$" ";VERSION;\\1" out "${out}")
-
-  # Parse the rest according to package type
-  if(packageType STREQUAL "git")
-    # For git repos we interpret #... as a tag or branch or commit hash
-    string(REGEX REPLACE "#([^#]+)$" ";GIT_TAG;\\1" out "${out}")
-  elseif(packageType STREQUAL "archive")
-    # For archives we interpret #... as a URL hash.
-    string(REGEX REPLACE "#([^#]+)$" ";URL_HASH;\\1" out "${out}")
-    # We don't try to parse the version if it's not provided explicitly. cpm_get_version_from_url
-    # should do this at a later point
-  else()
-    # We should never get here. This is an assertion and hitting it means there's a bug in the code
-    # above. A packageType was set, but not handled by this if-else.
-    message(FATAL_ERROR "CPM: Unsupported package type '${packageType}' of '${arg}'")
-  endif()
-
-  set(${outArgs}
-      ${out}
-      PARENT_SCOPE
-  )
-endfunction()
-
 # Download and add a package from source
 function(CPMAddPackage)
-  list(LENGTH ARGN argnLength)
-  if(argnLength EQUAL 1)
-    cpm_parse_add_package_single_arg("${ARGN}" ARGN)

-    # The shorthand syntax implies EXCLUDE_FROM_ALL
-    set(ARGN "${ARGN};EXCLUDE_FROM_ALL;YES")
-  endif()
+  set(flagArgs EXCLUDE_FROM_ALL)

  set(oneValueArgs
      NAME
@@ -372,20 +253,17 @@ function(CPMAddPackage)
      DOWNLOAD_ONLY
      GITHUB_REPOSITORY
      GITLAB_REPOSITORY
-      BITBUCKET_REPOSITORY
      GIT_REPOSITORY
      SOURCE_DIR
      DOWNLOAD_COMMAND
      FIND_PACKAGE_ARGUMENTS
      NO_CACHE
      GIT_SHALLOW
-      EXCLUDE_FROM_ALL
-      SOURCE_SUBDIR
  )

-  set(multiValueArgs URL OPTIONS)
+  set(multiValueArgs OPTIONS)

-  cmake_parse_arguments(CPM_ARGS "" "${oneValueArgs}" "${multiValueArgs}" "${ARGN}")
+  cmake_parse_arguments(CPM_ARGS "${flagArgs}" "${oneValueArgs}" "${multiValueArgs}" "${ARGN}")

  # Set default values for arguments

@@ -403,10 +281,10 @@ function(CPMAddPackage)

  if(DEFINED CPM_ARGS_GITHUB_REPOSITORY)
    set(CPM_ARGS_GIT_REPOSITORY "https://github.com/${CPM_ARGS_GITHUB_REPOSITORY}.git")
-  elseif(DEFINED CPM_ARGS_GITLAB_REPOSITORY)
+  endif()
+
+  if(DEFINED CPM_ARGS_GITLAB_REPOSITORY)
    set(CPM_ARGS_GIT_REPOSITORY "https://gitlab.com/${CPM_ARGS_GITLAB_REPOSITORY}.git")
-  elseif(DEFINED CPM_ARGS_BITBUCKET_REPOSITORY)
-    set(CPM_ARGS_GIT_REPOSITORY "https://bitbucket.org/${CPM_ARGS_BITBUCKET_REPOSITORY}.git")
  endif()

  if(DEFINED CPM_ARGS_GIT_REPOSITORY)
@@ -414,11 +292,6 @@ function(CPMAddPackage)
    if(NOT DEFINED CPM_ARGS_GIT_TAG)
      set(CPM_ARGS_GIT_TAG v${CPM_ARGS_VERSION})
    endif()
-
-    # If a name wasn't provided, try to infer it from the git repo
-    if(NOT DEFINED CPM_ARGS_NAME)
-      cpm_package_name_from_git_uri(${CPM_ARGS_GIT_REPOSITORY} CPM_ARGS_NAME)
-    endif()
  endif()

  set(CPM_SKIP_FETCH FALSE)
@@ -431,35 +304,8 @@ function(CPMAddPackage)
    endif()
  endif()

-  if(DEFINED CPM_ARGS_URL)
-    # If a name or version aren't provided, try to infer them from the URL
-    list(GET CPM_ARGS_URL 0 firstUrl)
-    cpm_package_name_and_ver_from_url(${firstUrl} nameFromUrl verFromUrl)
-    # If we fail to obtain name and version from the first URL, we could try other URLs if any.
-    # However multiple URLs are expected to be quite rare, so for now we won't bother.
-
-    # If the caller provided their own name and version, they trump the inferred ones.
-    if(NOT DEFINED CPM_ARGS_NAME)
-      set(CPM_ARGS_NAME ${nameFromUrl})
-    endif()
-    if(NOT DEFINED CPM_ARGS_VERSION)
-      set(CPM_ARGS_VERSION ${verFromUrl})
-    endif()
-
-    list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS URL "${CPM_ARGS_URL}")
-  endif()
-
-  # Check for required arguments
-
-  if(NOT DEFINED CPM_ARGS_NAME)
-    message(
-      FATAL_ERROR
-        "CPM: 'NAME' was not provided and couldn't be automatically inferred for package added with arguments: '${ARGN}'"
-    )
-  endif()
-
  # Check if package has been added before
-  cpm_check_if_package_already_added(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}")
+  cpm_check_if_package_already_added(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}" "${CPM_ARGS_OPTIONS}")
  if(CPM_PACKAGE_ALREADY_ADDED)
    cpm_export_variables(${CPM_ARGS_NAME})
    return()
@@ -470,12 +316,10 @@ function(CPMAddPackage)
    set(PACKAGE_SOURCE ${CPM_${CPM_ARGS_NAME}_SOURCE})
    set(CPM_${CPM_ARGS_NAME}_SOURCE "")
    CPMAddPackage(
-      NAME "${CPM_ARGS_NAME}"
-      SOURCE_DIR "${PACKAGE_SOURCE}"
-      EXCLUDE_FROM_ALL "${CPM_ARGS_EXCLUDE_FROM_ALL}"
-      OPTIONS "${CPM_ARGS_OPTIONS}"
-      SOURCE_SUBDIR "${CPM_ARGS_SOURCE_SUBDIR}"
+      NAME ${CPM_ARGS_NAME}
+      SOURCE_DIR ${PACKAGE_SOURCE}
      FORCE True
+      OPTIONS ${CPM_ARGS_OPTIONS}
    )
    cpm_export_variables(${CPM_ARGS_NAME})
    return()
@@ -488,7 +332,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_check_if_package_already_added(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}" "${CPM_ARGS_OPTIONS}")
    return()
  endif()

@@ -510,6 +354,16 @@ function(CPMAddPackage)

  CPMRegisterPackage("${CPM_ARGS_NAME}" "${CPM_ARGS_VERSION}")

+  if(CPM_ARGS_OPTIONS)
+    foreach(OPTION ${CPM_ARGS_OPTIONS})
+      cpm_parse_option(${OPTION})
+      set(${OPTION_KEY}
+          ${OPTION_VALUE}
+          CACHE INTERNAL ""
+      )
+    endforeach()
+  endif()
+
  if(DEFINED CPM_ARGS_GIT_TAG)
    set(PACKAGE_INFO "${CPM_ARGS_GIT_TAG}")
  elseif(DEFINED CPM_ARGS_SOURCE_DIR)
@@ -518,13 +372,6 @@ function(CPMAddPackage)
    set(PACKAGE_INFO "${CPM_ARGS_VERSION}")
  endif()

-  if(DEFINED FETCHCONTENT_BASE_DIR)
-    # respect user's FETCHCONTENT_BASE_DIR if set
-    set(CPM_FETCHCONTENT_BASE_DIR ${FETCHCONTENT_BASE_DIR})
-  else()
-    set(CPM_FETCHCONTENT_BASE_DIR ${CMAKE_BINARY_DIR}/_deps)
-  endif()
-
  if(DEFINED CPM_ARGS_DOWNLOAD_COMMAND)
    list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS DOWNLOAD_COMMAND ${CPM_ARGS_DOWNLOAD_COMMAND})
  elseif(DEFINED CPM_ARGS_SOURCE_DIR)
@@ -535,20 +382,17 @@ function(CPMAddPackage)
    list(SORT origin_parameters)
    string(SHA1 origin_hash "${origin_parameters}")
    set(download_directory ${CPM_SOURCE_CACHE}/${lower_case_name}/${origin_hash})
-    # Expand `download_directory` relative path. This is important because EXISTS doesn't work for
-    # relative paths.
-    get_filename_component(download_directory ${download_directory} ABSOLUTE)
    list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS SOURCE_DIR ${download_directory})
    if(EXISTS ${download_directory})
      # avoid FetchContent modules to improve performance
-      set(${CPM_ARGS_NAME}_BINARY_DIR ${CPM_FETCHCONTENT_BASE_DIR}/${lower_case_name}-build)
+      set(${CPM_ARGS_NAME}_BINARY_DIR ${CMAKE_BINARY_DIR}/_deps/${lower_case_name}-build)
      set(${CPM_ARGS_NAME}_ADDED YES)
      set(${CPM_ARGS_NAME}_SOURCE_DIR ${download_directory})
-      cpm_add_subdirectory(
-        "${CPM_ARGS_NAME}" "${DOWNLOAD_ONLY}"
-        "${${CPM_ARGS_NAME}_SOURCE_DIR}/${CPM_ARGS_SOURCE_SUBDIR}" "${${CPM_ARGS_NAME}_BINARY_DIR}"
-        "${CPM_ARGS_EXCLUDE_FROM_ALL}" "${CPM_ARGS_OPTIONS}"
-      )
+      if(NOT CPM_ARGS_DOWNLOAD_ONLY AND EXISTS ${download_directory}/CMakeLists.txt)
+        cpm_add_subdirectory(
+          ${download_directory} ${${CPM_ARGS_NAME}_BINARY_DIR} "${CPM_ARGS_EXCLUDE_FROM_ALL}"
+        )
+      endif()
      set(CPM_SKIP_FETCH TRUE)
      set(PACKAGE_INFO "${PACKAGE_INFO} at ${download_directory}")
    else()
@@ -562,7 +406,7 @@ function(CPMAddPackage)
      endif()

      # remove timestamps so CMake will re-download the dependency
-      file(REMOVE_RECURSE ${CPM_FETCHCONTENT_BASE_DIR}/${lower_case_name}-subbuild)
+      file(REMOVE_RECURSE ${CMAKE_BINARY_DIR}/_deps/${lower_case_name}-subbuild)
      set(PACKAGE_INFO "${PACKAGE_INFO} to ${download_directory}")
    endif()
  endif()
@@ -587,12 +431,7 @@ function(CPMAddPackage)
    cpm_declare_fetch(
      "${CPM_ARGS_NAME}" "${CPM_ARGS_VERSION}" "${PACKAGE_INFO}" "${CPM_ARGS_UNPARSED_ARGUMENTS}"
    )
-    cpm_fetch_package("${CPM_ARGS_NAME}")
-    cpm_add_subdirectory(
-      "${CPM_ARGS_NAME}" "${DOWNLOAD_ONLY}"
-      "${${CPM_ARGS_NAME}_SOURCE_DIR}/${CPM_ARGS_SOURCE_SUBDIR}" "${${CPM_ARGS_NAME}_BINARY_DIR}"
-      "${CPM_ARGS_EXCLUDE_FROM_ALL}" "${CPM_ARGS_OPTIONS}"
-    )
+    cpm_fetch_package("${CPM_ARGS_NAME}" "${DOWNLOAD_ONLY}" "${CPM_ARGS_EXCLUDE_FROM_ALL}")
    cpm_get_fetch_properties("${CPM_ARGS_NAME}")
  endif()

@@ -715,62 +554,36 @@ function(cpm_get_fetch_properties PACKAGE)
  )
 endfunction()

-# adds a package as a subdirectory if viable, according to provided options
-function(
-  cpm_add_subdirectory
-  PACKAGE
-  DOWNLOAD_ONLY
-  SOURCE_DIR
-  BINARY_DIR
-  EXCLUDE
-  OPTIONS
-)
-  if(NOT DOWNLOAD_ONLY AND EXISTS ${SOURCE_DIR}/CMakeLists.txt)
-    if(EXCLUDE)
-      set(addSubdirectoryExtraArgs EXCLUDE_FROM_ALL)
-    else()
-      set(addSubdirectoryExtraArgs "")
-    endif()
-    if(OPTIONS)
-      # the policy allows us to change options without caching
-      cmake_policy(SET CMP0077 NEW)
-      set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
-
-      foreach(OPTION ${OPTIONS})
-        cpm_parse_option(${OPTION})
-        set(${OPTION_KEY} ${OPTION_VALUE})
-      endforeach()
-    endif()
-    set(CPM_OLD_INDENT "${CPM_INDENT}")
-    set(CPM_INDENT "${CPM_INDENT} ${PACKAGE}:")
-    add_subdirectory(${SOURCE_DIR} ${BINARY_DIR} ${addSubdirectoryExtraArgs})
-    set(CPM_INDENT "${CPM_OLD_INDENT}")
+function(cpm_add_subdirectory SOURCE_DIR BINARY_DIR EXCLUDE)
+  if(EXCLUDE)
+    set(addSubdirectoryExtraArgs EXCLUDE_FROM_ALL)
+  else()
+    set(addSubdirectoryExtraArgs "")
  endif()
+  add_subdirectory(${SOURCE_DIR} ${BINARY_DIR} ${addSubdirectoryExtraArgs})
 endfunction()

-# downloads a previously declared package via FetchContent and exports the variables
-# `${PACKAGE}_SOURCE_DIR` and `${PACKAGE}_BINARY_DIR` to the parent scope
-function(cpm_fetch_package PACKAGE)
+# downloads a previously declared package via FetchContent
+function(cpm_fetch_package PACKAGE DOWNLOAD_ONLY EXCLUDE)
  if(${CPM_DRY_RUN})
    message(STATUS "${CPM_INDENT} package ${PACKAGE} not fetched (dry run)")
    return()
  endif()

  FetchContent_GetProperties(${PACKAGE})
+  string(TOLOWER "${PACKAGE}" lower_case_name)

  if(NOT ${lower_case_name}_POPULATED)
    FetchContent_Populate(${PACKAGE})
+    if(NOT DOWNLOAD_ONLY AND EXISTS ${${lower_case_name}_SOURCE_DIR}/CMakeLists.txt)
+      set(CPM_OLD_INDENT "${CPM_INDENT}")
+      set(CPM_INDENT "${CPM_INDENT} ${PACKAGE}:")
+      cpm_add_subdirectory(
+        ${${lower_case_name}_SOURCE_DIR} ${${lower_case_name}_BINARY_DIR} ${EXCLUDE}
+      )
+      set(CPM_INDENT "${CPM_OLD_INDENT}")
+    endif()
  endif()
-
-  string(TOLOWER "${PACKAGE}" lower_case_name)
-  set(${PACKAGE}_SOURCE_DIR
-      ${${lower_case_name}_SOURCE_DIR}
-      PARENT_SCOPE
-  )
-  set(${PACKAGE}_BINARY_DIR
-      ${${lower_case_name}_BINARY_DIR}
-      PARENT_SCOPE
-  )
 endfunction()

 # splits a package option
--- a/cmake/testing.cmake
+++ b/cmake/testing.cmake
@@ -3,25 +3,13 @@ function(ASSERT_EQUAL)
    message(FATAL_ERROR "assertion failed: invalid argument count: ${ARGC}")
  endif()

-  if(NOT "${ARGV0}" STREQUAL "${ARGV1}")
+  if(NOT ${ARGV0} STREQUAL ${ARGV1})
    message(FATAL_ERROR "assertion failed: '${ARGV0}' != '${ARGV1}'")
  else()
    message(STATUS "test passed: '${ARGV0}' == '${ARGV1}'")
  endif()
 endfunction()

-function(ASSERT_NOT_EQUAL)
-  if(NOT ARGC EQUAL 2)
-    message(FATAL_ERROR "assertion failed: invalid argument count: ${ARGC}")
-  endif()
-
-  if("${ARGV0}" STREQUAL "${ARGV1}")
-    message(FATAL_ERROR "assertion failed: '${ARGV0}' == '${ARGV1}'")
-  else()
-    message(STATUS "test passed: '${ARGV0}' != '${ARGV1}'")
-  endif()
-endfunction()
-
 function(ASSERT_EMPTY)
  if(NOT ARGC EQUAL 0)
    message(FATAL_ERROR "assertion failed: input ${ARGC} not empty: '${ARGV}'")
@@ -36,27 +24,11 @@ function(ASSERT_DEFINED KEY)
  endif()
 endfunction()

-function(ASSERT_NOT_DEFINED KEY)
-  if(DEFINED ${KEY})
-    message(FATAL_ERROR "assertion failed: '${KEY}' is defiend (${${KEY}})")
-  else()
-    message(STATUS "test passed: '${KEY}' is not defined")
-  endif()
-endfunction()
-
 function(ASSERT_TRUTHY KEY)
  if(${${KEY}})
    message(STATUS "test passed: '${KEY}' is set truthy")
  else()
-    message(FATAL_ERROR "assertion failed: value of '${KEY}' is not truthy (${${KEY}})")
-  endif()
-endfunction()
-
-function(ASSERT_FALSY KEY)
-  if(${${KEY}})
-    message(FATAL_ERROR "assertion failed: value of '${KEY}' is not falsy (${${KEY}})")
-  else()
-    message(STATUS "test passed: '${KEY}' is set falsy")
+    message(FATAL_ERROR "assertion failed: value of '${KEY}' is not true (${${KEY}})")
  endif()
 endfunction()

--- a/examples/TestingFramework/CMakeLists.txt
+++ b/examples/TestingFramework/CMakeLists.txt
@@ -1,7 +0,0 @@
-cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
-
-project(CPMTestingFrameworkExample)
-
-include(../../cmake/CPM.cmake)
-CPMAddPackage("bb:HEMRND/TestingFramework@0.4.1")
-add_test_suites(TESTS SomeTest)
--- a/examples/TestingFramework/SomeTest.cpp
+++ b/examples/TestingFramework/SomeTest.cpp
@@ -1,19 +0,0 @@
-#include <HEM/TestingFramework.hpp>
-
-using namespace fakeit;
-
-class ITest {
-public:
-  virtual int getInt() = 0;
-};
-
-TEST_CASE("Testing Framework Test") {
-  constexpr int someIntValue = 123456;
-
-  Mock<ITest> testMock;
-  When(Method(testMock, getInt)).Return(someIntValue);
-
-  int readValue = testMock.get().getInt();
-
-  REQUIRE(readValue == someIntValue);
-}
--- a/examples/asio-standalone/CMakeLists.txt
+++ b/examples/asio-standalone/CMakeLists.txt
@@ -8,7 +8,12 @@ include(../../cmake/CPM.cmake)

 find_package(Threads REQUIRED)

-CPMAddPackage("gh:chriskohlhoff/asio#asio-1-18-1@1.18.1")
+CPMAddPackage(
+  NAME asio
+  VERSION 1.18.1
+  GITHUB_REPOSITORY chriskohlhoff/asio
+  GIT_TAG asio-1-18-1 # asio uses non-standard version tag, we must specify GIT_TAG
+)

 # ASIO doesn't use CMake, we have to configure it manually. Extra notes for using on Windows:
 #
--- a/examples/benchmark/CMakeLists.txt
+++ b/examples/benchmark/CMakeLists.txt
@@ -6,7 +6,11 @@ project(CPMExampleBenchmark)

 include(../../cmake/CPM.cmake)

-CPMAddPackage("gh:cpm-cmake/testpack-fibonacci@2.0")
+CPMAddPackage(
+  NAME fibonacci
+  GITLAB_REPOSITORY TheLartians/Fibonacci
+  VERSION 2.0
+)

 CPMAddPackage(
  NAME benchmark
@@ -16,7 +20,7 @@ CPMAddPackage(
 )

 if(benchmark_ADDED)
-  # enable c++11 to avoid compilation errors
+  # Don't use C++14 because it doesn't work in some configurations.
  set_target_properties(benchmark PROPERTIES CXX_STANDARD 11)
 endif()

--- a/examples/boost/CMakeLists.txt
+++ b/examples/boost/CMakeLists.txt
@@ -11,8 +11,12 @@ target_compile_features(CPMExampleBoost PRIVATE cxx_std_17)

 include(../../cmake/CPM.cmake)

-# boost-cmake currently doesn't tag versions, so we use the according boost version
-CPMAddPackage("gh:Orphis/boost-cmake#7f97a08b64bd5d2e53e932ddf80c40544cf45edf@1.71.0")
+CPMFindPackage(
+  NAME Boost
+  GITHUB_REPOSITORY Orphis/boost-cmake
+  VERSION 1.67.0
+  FIND_PACKAGE_ARGUMENTS "COMPONENTS system"
+)

 find_package(Threads REQUIRED)

--- a/examples/catch2/CMakeLists.txt
+++ b/examples/catch2/CMakeLists.txt
@@ -6,8 +6,17 @@ project(CPMExampleCatch2)

 include(../../cmake/CPM.cmake)

-CPMAddPackage("gh:cpm-cmake/testpack-fibonacci@2.0")
-CPMAddPackage("gh:catchorg/Catch2@2.13.4")
+CPMAddPackage(
+  NAME fibonacci
+  GITHUB_REPOSITORY TheLartians/Fibonacci
+  VERSION 2.0
+)
+
+CPMAddPackage(
+  NAME Catch2
+  GITHUB_REPOSITORY catchorg/Catch2
+  VERSION 2.13.4
+)

 # ---- Create binary ----

--- a/examples/cxxopts/CMakeLists.txt
+++ b/examples/cxxopts/CMakeLists.txt
@@ -6,7 +6,12 @@ project(CPMExampleCXXOpts)

 include(../../cmake/CPM.cmake)

-CPMAddPackage("gh:jarro2783/cxxopts@2.2.0")
+CPMAddPackage(
+  NAME cxxopts
+  GITHUB_REPOSITORY jarro2783/cxxopts
+  VERSION 2.2.0
+  OPTIONS "CXXOPTS_BUILD_EXAMPLES Off" "CXXOPTS_BUILD_TESTS Off"
+)

 # ---- Create binary ----

--- a/examples/cxxopts/main.cpp
+++ b/examples/cxxopts/main.cpp
@@ -3,8 +3,8 @@

 int main(int argc, char** argv) {
  cxxopts::Options options("MyProgram", "One line description of MyProgram");
-  options.add_options()("h,help", "Show help")(
-      "d,debug", "Enable debugging")("f,file", "File name", cxxopts::value<std::string>());
+  options.add_options()("h,help", "Show help")("d,debug", "Enable debugging")(
+      "f,file", "File name", cxxopts::value<std::string>());

  auto result = options.parse(argc, argv);

--- a/examples/doctest/CMakeLists.txt
+++ b/examples/doctest/CMakeLists.txt
@@ -6,8 +6,17 @@ project(CPMExampleDoctest)

 include(../../cmake/CPM.cmake)

-CPMAddPackage("gh:cpm-cmake/testpack-fibonacci@2.0")
-CPMAddPackage("gh:onqtam/doctest#2.4.5")
+CPMAddPackage(
+  NAME fibonacci
+  GITLAB_REPOSITORY TheLartians/Fibonacci
+  VERSION 2.0
+)
+
+CPMAddPackage(
+  NAME doctest
+  GITHUB_REPOSITORY onqtam/doctest
+  GIT_TAG 2.4.5
+)

 # ---- Create binary ----

--- a/examples/fmt/CMakeLists.txt
+++ b/examples/fmt/CMakeLists.txt
@@ -6,7 +6,11 @@ project(CPMJSONExample)

 include(../../cmake/CPM.cmake)

-CPMAddPackage("gh:fmtlib/fmt#7.1.3")
+CPMAddPackage(
+  NAME fmt
+  GIT_TAG 7.1.3
+  GITHUB_REPOSITORY fmtlib/fmt
+)

 # ---- Executable ----

--- a/examples/gtest/CMakeLists.txt
+++ b/examples/gtest/CMakeLists.txt
@@ -6,7 +6,11 @@ project(CPMExampleGtest)

 include(../../cmake/CPM.cmake)

-CPMAddPackage("gh:cpm-cmake/testpack-fibonacci@2.0")
+CPMAddPackage(
+  NAME fibonacci
+  GITLAB_REPOSITORY TheLartians/Fibonacci
+  VERSION 2.0
+)

 CPMAddPackage(
  NAME googletest
--- a/examples/json/CMakeLists.txt
+++ b/examples/json/CMakeLists.txt
@@ -5,10 +5,22 @@ project(CPMJSONExample)
 # ---- Dependencies ----

 include(../../cmake/CPM.cmake)
-CPMAddPackage("gh:nlohmann/json@3.9.1")
+
+CPMAddPackage(
+  NAME nlohmann_json
+  VERSION 3.9.1
+  # not using the repo as it takes forever to clone
+  URL https://github.com/nlohmann/json/releases/download/v3.9.1/include.zip
+  URL_HASH SHA256=6bea5877b1541d353bd77bdfbdb2696333ae5ed8f9e8cc22df657192218cad91
+)
+
+if(nlohmann_json_ADDED)
+  add_library(nlohmann_json INTERFACE)
+  target_include_directories(nlohmann_json SYSTEM INTERFACE ${nlohmann_json_SOURCE_DIR}/include)
+endif()

 # ---- Executable ----

 add_executable(CPMJSONExample main.cpp)
 target_compile_features(CPMJSONExample PRIVATE cxx_std_17)
-target_link_libraries(CPMJSONExample nlohmann_json::nlohmann_json)
+target_link_libraries(CPMJSONExample nlohmann_json)
--- a/examples/linenoise/CMakeLists.txt
+++ b/examples/linenoise/CMakeLists.txt
@@ -6,7 +6,11 @@ project(CPMlinenoiseExample)

 include(../../cmake/CPM.cmake)

-CPMAddPackage("gh:antirez/linenoise#1.0")
+CPMAddPackage(
+  NAME linenoise
+  GIT_TAG 1.0
+  GITHUB_REPOSITORY antirez/linenoise
+)

 if(linenoise_ADDED)
  add_library(linenoise ${linenoise_SOURCE_DIR}/linenoise.c)
--- a/examples/range-v3/CMakeLists.txt
+++ b/examples/range-v3/CMakeLists.txt
@@ -6,7 +6,18 @@ project(CPMRangev3Example)

 include(../../cmake/CPM.cmake)

-CPMAddPackage("gh:ericniebler/range-v3#0.11.0")
+CPMAddPackage(
+  NAME range-v3
+  URL https://github.com/ericniebler/range-v3/archive/0.11.0.zip
+  VERSION 0.11.0
+  # the range-v3 CMakeLists screws with configuration options
+  DOWNLOAD_ONLY True
+)
+
+if(range-v3_ADDED)
+  add_library(range-v3 INTERFACE IMPORTED)
+  target_include_directories(range-v3 SYSTEM INTERFACE "${range-v3_SOURCE_DIR}/include")
+endif()

 # ---- Executable ----

--- a/examples/range-v3/main.cpp
+++ b/examples/range-v3/main.cpp
@@ -32,7 +32,7 @@ auto is_six = [](int i) { return i == 6; };
 int main() {
  std::vector<int> v{6, 2, 3, 4, 5, 6};
  cout << std::boolalpha;
-  cout << "vector: " << ranges::views::all(v) << '\n';
+  cout << "vector: " << ranges::view::all(v) << '\n';

  cout << "vector any_of is_six: " << ranges::any_of(v, is_six) << '\n';
  cout << "vector all_of is_six: " << ranges::all_of(v, is_six) << '\n';
--- a/examples/spdlog/CMakeLists.txt
+++ b/examples/spdlog/CMakeLists.txt
@@ -6,7 +6,11 @@ project(CPMSpdlogExample)

 include(../../cmake/CPM.cmake)

-CPMAddPackage("gh:gabime/spdlog@1.8.2")
+CPMAddPackage(
+  NAME spdlog
+  GITHUB_REPOSITORY gabime/spdlog
+  VERSION 1.8.2
+)

 # ---- Executable ----

--- a/examples/yaml/CMakeLists.txt
+++ b/examples/yaml/CMakeLists.txt
@@ -6,7 +6,13 @@ project(CPMYamlExample)

 include(../../cmake/CPM.cmake)

-CPMAddPackage("gh:jbeder/yaml-cpp#yaml-cpp-0.6.3@0.6.3")
+CPMAddPackage(
+  NAME yaml-cpp
+  GIT_REPOSITORY https://github.com/jbeder/yaml-cpp.git
+  VERSION 0.6.3
+  GIT_TAG yaml-cpp-0.6.3
+  OPTIONS "YAML_CPP_BUILD_TESTS Off" "YAML_CPP_BUILD_CONTRIB Off" "YAML_CPP_BUILD_TOOLS Off"
+)

 # ---- Executable ----

--- a/test/unit/broken_dependency/.gitignore
+++ b/test/unit/broken_dependency/.gitignore
@@ -1,2 +0,0 @@
-/CMakeLists.txt
-/package-lock.cmake
--- a/test/unit/broken_dependency/CMakeLists.txt.in
+++ b/test/unit/broken_dependency/CMakeLists.txt.in
@@ -1,13 +0,0 @@
-cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
-
-project(CPMTest)
-
-# ---- Dependencies ----
-
-include(@CPM_PATH@/CPM.cmake)
-
-CPMAddPackage(
-  NAME BrokenDependency
-  SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependency
-  EXCLUDE_FROM_ALL @EXCLUDE_FROM_ALL@
-)
--- a/test/unit/broken_dependency/dependency/CMakeLists.txt
+++ b/test/unit/broken_dependency/dependency/CMakeLists.txt
@@ -1,3 +0,0 @@
-project(BrokenDependency)
-
-add_custom_target(error ALL ${CMAKE_COMMAND} -E false)
--- a/test/unit/exclude_from_all.cmake
+++ b/test/unit/exclude_from_all.cmake
@@ -1,35 +0,0 @@
-include(CMakePackageConfigHelpers)
-include(${CPM_PATH}/testing.cmake)
-
-set(TEST_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/exclude_from_all)
-
-function(init_project EXCLUDE_FROM_ALL)
-  configure_package_config_file(
-    "${CMAKE_CURRENT_LIST_DIR}/broken_dependency/CMakeLists.txt.in"
-    "${CMAKE_CURRENT_LIST_DIR}/broken_dependency/CMakeLists.txt"
-    INSTALL_DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/junk
-  )
-
-  execute_process(
-    COMMAND ${CMAKE_COMMAND} "-H${CMAKE_CURRENT_LIST_DIR}/broken_dependency" "-B${TEST_BUILD_DIR}"
-    RESULT_VARIABLE ret
-  )
-
-  assert_equal(${ret} "0")
-endfunction()
-
-function(build_project expected_success)
-  execute_process(COMMAND ${CMAKE_COMMAND} "--build" "${TEST_BUILD_DIR}" RESULT_VARIABLE ret)
-
-  if(expected_success)
-    assert_equal(${ret} 0)
-  else()
-    assert_not_equal(${ret} 0)
-  endif()
-endfunction()
-
-init_project(FALSE)
-build_project(FALSE)
-
-init_project(TRUE)
-build_project(TRUE)
--- a/test/unit/local_dependency/OptionsCMakeLists.txt.in
+++ b/test/unit/local_dependency/OptionsCMakeLists.txt.in
@@ -1,33 +0,0 @@
-cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
-
-project(CPMTest)
-
-# ---- Options ----
-
-option(ENABLE_TEST_COVERAGE "Enable test coverage" OFF)
-
-# ---- Dependencies ----
-
-include(@CPM_PATH@/CPM.cmake)
-
-CPMAddPackage(
-  NAME Dependency
-  SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependency
-  OPTIONS "DEFINE_ALTERNATIVE_FUNCTION YES"
-  EXCLUDE_FROM_ALL YES
-)
-
-# ---- Dependencies ----
-
-alternative_dependency_function()
-
-# ---- Check parameters ----
-
-include(@CPM_PATH@/testing.cmake)
-
-message("DEFINE_ALTERNATIVE_FUNCTION: ${DEFINE_ALTERNATIVE_FUNCTION}")
-
-# this option is overridden by CPM.cmake
-ASSERT_NOT_DEFINED(DEFINE_ALTERNATIVE_FUNCTION)
-# this option is leaked by the dependency
-ASSERT_EQUAL(${LEAKED_OPTION} "OFF")
--- a/test/unit/local_dependency/SubdirCMakeLists.txt.in
+++ b/test/unit/local_dependency/SubdirCMakeLists.txt.in
@@ -1,17 +0,0 @@
-cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
-
-project(CPMTest)
-
-# ---- Dependencies ----
-
-include(@CPM_PATH@/CPM.cmake)
-
-CPMAddPackage(
-  NAME Dependency
-  SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependency
-  SOURCE_SUBDIR inner
-)
-
-# ---- Call inner dependency method to validate correct addition of subdirectory ----
-
-inner_dependency_function()
--- a/test/unit/local_dependency/dependency/CMakeLists.txt
+++ b/test/unit/local_dependency/dependency/CMakeLists.txt
@@ -1,14 +1,3 @@
-cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
-
-option(DEFINE_ALTERNATIVE_FUNCTION "define the alternative function" OFF)
-option(LEAKED_OPTION "this option will be leaked to the outer scope" OFF)
-
-if(NOT DEFINE_ALTERNATIVE_FUNCTION)
-  function(dependency_function)
-    message("called external method")
-  endfunction()
-else()
-  function(alternative_dependency_function)
-    message("called alternative external method")
-  endfunction()
-endif()
+function(dependency_function)
+  message("called external method")
+endfunction()
--- a/test/unit/local_dependency/dependency/inner/CMakeLists.txt
+++ b/test/unit/local_dependency/dependency/inner/CMakeLists.txt
@@ -1,3 +0,0 @@
-function(inner_dependency_function)
-  message("called inner method")
-endfunction()
--- a/test/unit/options.cmake
+++ b/test/unit/options.cmake
@@ -1,19 +0,0 @@
-include(CMakePackageConfigHelpers)
-include(${CPM_PATH}/testing.cmake)
-
-set(TEST_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/source_dir)
-
-set(TEST_DEPENDENCY_NAME Dependency)
-
-configure_package_config_file(
-  "${CMAKE_CURRENT_LIST_DIR}/local_dependency/OptionsCMakeLists.txt.in"
-  "${CMAKE_CURRENT_LIST_DIR}/local_dependency/CMakeLists.txt"
-  INSTALL_DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/junk
-)
-
-execute_process(
-  COMMAND ${CMAKE_COMMAND} "-H${CMAKE_CURRENT_LIST_DIR}/local_dependency" "-B${TEST_BUILD_DIR}"
-  RESULT_VARIABLE ret
-)
-
-assert_equal(${ret} "0")
--- a/test/unit/package_name_and_ver_from_url.cmake
+++ b/test/unit/package_name_and_ver_from_url.cmake
@@ -1,60 +0,0 @@
-cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
-
-include(${CPM_PATH}/CPM.cmake)
-include(${CPM_PATH}/testing.cmake)
-
-cpm_package_name_and_ver_from_url("https://example.com/coolpack-1.2.3.zip" name ver)
-assert_equal("coolpack" ${name})
-assert_equal("1.2.3" ${ver})
-
-cpm_package_name_and_ver_from_url("https://example.com/cool-pack-v1.3.tar.gz" name ver)
-assert_equal("cool-pack" ${name})
-assert_equal("1.3" ${ver})
-
-cpm_package_name_and_ver_from_url(
-  "https://subd.zip.com/download.php?Cool.Pack-v1.2.3rc0.tar" name ver
-)
-assert_equal("Cool.Pack" ${name})
-assert_equal("1.2.3rc0" ${ver})
-
-cpm_package_name_and_ver_from_url(
-  "http://evil-1.2.tar.gz.com/Plan9_1.2.3a.tar.bz2?download" name ver
-)
-assert_equal("Plan9" ${name})
-assert_equal("1.2.3a" ${ver})
-
-cpm_package_name_and_ver_from_url(
-  "http://evil-1.2.tar.gz.com/Plan_9-1.2.3a.tar.bz2?download" name ver
-)
-assert_equal("Plan_9" ${name})
-assert_equal("1.2.3a" ${ver})
-
-cpm_package_name_and_ver_from_url(
-  "http://evil-1.2.tar.gz.com/Plan-9_1.2.3a.tar.bz2?download" name ver
-)
-assert_equal("Plan-9" ${name})
-assert_equal("1.2.3a" ${ver})
-
-cpm_package_name_and_ver_from_url("https://sf.com/distrib/SFLib-0.999.4.tar.gz/download" name ver)
-assert_equal("SFLib" ${name})
-assert_equal("0.999.4" ${ver})
-
-cpm_package_name_and_ver_from_url("https://example.com/coolpack/v5.6.5rc44.zip" name ver)
-assert_not_defined(name)
-assert_equal("5.6.5rc44" ${ver})
-
-cpm_package_name_and_ver_from_url("evil-1.3.zip.com/coolpack/release999.000beta.ZIP" name ver)
-assert_not_defined(name)
-assert_equal("999.000beta" ${ver})
-
-cpm_package_name_and_ver_from_url("https://example.com/Foo55.tar.gz" name ver)
-assert_equal("Foo55" ${name})
-assert_not_defined(ver)
-
-cpm_package_name_and_ver_from_url("https://example.com/foo" name ver)
-assert_not_defined(name)
-assert_not_defined(ver)
-
-cpm_package_name_and_ver_from_url("example.zip.com/foo" name ver)
-assert_not_defined(name)
-assert_not_defined(ver)
--- a/test/unit/package_name_from_git_uri.cmake
+++ b/test/unit/package_name_from_git_uri.cmake
@@ -1,28 +0,0 @@
-cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
-
-include(${CPM_PATH}/CPM.cmake)
-include(${CPM_PATH}/testing.cmake)
-
-cpm_package_name_from_git_uri("https://github.com/cpm-cmake/CPM.cmake.git" name)
-assert_equal("CPM.cmake" ${name})
-
-cpm_package_name_from_git_uri("ssh://user@host.xz:123/path/to/pkg.git/" name)
-assert_equal("pkg" ${name})
-
-cpm_package_name_from_git_uri("git://host.xz/path/to/pkg.git" name)
-assert_equal("pkg" ${name})
-
-cpm_package_name_from_git_uri("git@host.xz:cool-pkg.git" name)
-assert_equal("cool-pkg" ${name})
-
-cpm_package_name_from_git_uri("file:///path/to/pkg33.git" name)
-assert_equal("pkg33" ${name})
-
-cpm_package_name_from_git_uri("../local-repo/.git" name)
-assert_equal("local-repo" ${name})
-
-cpm_package_name_from_git_uri("asdf" name)
-assert_not_defined(name)
-
-cpm_package_name_from_git_uri("/something.git/stuff" name)
-assert_not_defined(name)
--- a/test/unit/parse_add_package_single_arg.cmake
+++ b/test/unit/parse_add_package_single_arg.cmake
@@ -1,71 +0,0 @@
-cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
-
-include(${CPM_PATH}/CPM.cmake)
-include(${CPM_PATH}/testing.cmake)
-
-cpm_parse_add_package_single_arg("gh:cpm-cmake/CPM.cmake" args)
-assert_equal("GITHUB_REPOSITORY;cpm-cmake/CPM.cmake" "${args}")
-
-cpm_parse_add_package_single_arg("gh:cpm-cmake/CPM.cmake@1.2.3" args)
-assert_equal("GITHUB_REPOSITORY;cpm-cmake/CPM.cmake;VERSION;1.2.3" "${args}")
-
-cpm_parse_add_package_single_arg("gh:cpm-cmake/CPM.cmake#master" args)
-assert_equal("GITHUB_REPOSITORY;cpm-cmake/CPM.cmake;GIT_TAG;master" "${args}")
-
-cpm_parse_add_package_single_arg("gh:cpm-cmake/CPM.cmake@0.20.3#asdf" args)
-assert_equal("GITHUB_REPOSITORY;cpm-cmake/CPM.cmake;VERSION;0.20.3;GIT_TAG;asdf" "${args}")
-
-cpm_parse_add_package_single_arg("gh:a/b#c@d" args)
-assert_equal("GITHUB_REPOSITORY;a/b;GIT_TAG;c;VERSION;d" "${args}")
-
-cpm_parse_add_package_single_arg("gh:foo#c@d" args)
-assert_equal("GITHUB_REPOSITORY;foo;GIT_TAG;c;VERSION;d" "${args}")
-
-cpm_parse_add_package_single_arg("gh:Foo@5" args)
-assert_equal("GITHUB_REPOSITORY;Foo;VERSION;5" "${args}")
-
-cpm_parse_add_package_single_arg("gl:foo/bar" args)
-assert_equal("GITLAB_REPOSITORY;foo/bar" "${args}")
-
-cpm_parse_add_package_single_arg("gl:foo/Bar" args)
-assert_equal("GITLAB_REPOSITORY;foo/Bar" "${args}")
-
-cpm_parse_add_package_single_arg("bb:foo/bar" args)
-assert_equal("BITBUCKET_REPOSITORY;foo/bar" "${args}")
-
-cpm_parse_add_package_single_arg("bb:foo/Bar" args)
-assert_equal("BITBUCKET_REPOSITORY;foo/Bar" "${args}")
-
-cpm_parse_add_package_single_arg("https://github.com/cpm-cmake/CPM.cmake.git@0.30.5" args)
-assert_equal("GIT_REPOSITORY;https://github.com/cpm-cmake/CPM.cmake.git;VERSION;0.30.5" "${args}")
-
-cpm_parse_add_package_single_arg("git@host.xz:user/pkg.git@0.1.2" args)
-assert_equal("GIT_REPOSITORY;git@host.xz:user/pkg.git;VERSION;0.1.2" "${args}")
-
-cpm_parse_add_package_single_arg("git@host.xz:user/pkg.git@0.1.2#rc" args)
-assert_equal("GIT_REPOSITORY;git@host.xz:user/pkg.git;VERSION;0.1.2;GIT_TAG;rc" "${args}")
-
-cpm_parse_add_package_single_arg(
-  "ssh://user@host.xz:123/path/to/pkg.git#fragment@1.2.3#branch" args
-)
-assert_equal(
-  "GIT_REPOSITORY;ssh://user@host.xz:123/path/to/pkg.git#fragment;VERSION;1.2.3;GIT_TAG;branch"
-  "${args}"
-)
-
-cpm_parse_add_package_single_arg("https://example.org/foo.tar.gz" args)
-assert_equal("URL;https://example.org/foo.tar.gz" "${args}")
-
-cpm_parse_add_package_single_arg("https://example.org/foo.tar.gz#baadf00d@1.2.0" args)
-assert_equal("URL;https://example.org/foo.tar.gz;URL_HASH;baadf00d;VERSION;1.2.0" "${args}")
-
-cpm_parse_add_package_single_arg("https://example.org/foo.tar.gz#MD5=baadf00d" args)
-assert_equal("URL;https://example.org/foo.tar.gz;URL_HASH;MD5=baadf00d" "${args}")
-
-cpm_parse_add_package_single_arg("https://example.org/Foo.zip#SHA3_512=1337" args)
-assert_equal("URL;https://example.org/Foo.zip;URL_HASH;SHA3_512=1337" "${args}")
-
-cpm_parse_add_package_single_arg("ftp://user:pass@server/pathname.zip#fragment#0ddb411@0" args)
-assert_equal(
-  "URL;ftp://user:pass@server/pathname.zip#fragment;URL_HASH;0ddb411;VERSION;0" "${args}"
-)
--- a/test/unit/remote_dependency/CMakeLists.txt.in
+++ b/test/unit/remote_dependency/CMakeLists.txt.in
@@ -12,7 +12,7 @@ include(@CPM_PATH@/CPM.cmake)

 CPMAddPackage(
  NAME fibonacci
-  GIT_REPOSITORY https://github.com/cpm-cmake/testpack-fibonacci.git
+  GIT_REPOSITORY https://github.com/TheLartians/Fibonacci.git
  VERSION @FIBONACCI_VERSION@
  @FIBONACCI_PACKAGE_ARGS@
 )
--- a/test/unit/subdir.cmake
+++ b/test/unit/subdir.cmake
@@ -1,17 +0,0 @@
-include(CMakePackageConfigHelpers)
-include(${CPM_PATH}/testing.cmake)
-
-set(TEST_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/source_dir)
-
-configure_package_config_file(
-  "${CMAKE_CURRENT_LIST_DIR}/local_dependency/SubdirCMakeLists.txt.in"
-  "${CMAKE_CURRENT_LIST_DIR}/local_dependency/CMakeLists.txt"
-  INSTALL_DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/junk
-)
-
-execute_process(
-  COMMAND ${CMAKE_COMMAND} "-H${CMAKE_CURRENT_LIST_DIR}/local_dependency" "-B${TEST_BUILD_DIR}"
-  RESULT_VARIABLE ret
-)
-
-assert_equal(${ret} "0")
Author	SHA1	Message	Date
Lars Melchior	1ce0b9926b	set EXCLUDE_FROM_ALL as an optional flag	2021-02-15 13:45:16 +01:00
Lars Melchior	c309839859	respect DOWNLOAD_ONLY flag	2021-02-15 13:11:51 +01:00
Lars Melchior	b80286ef81	add dependencies using EXCLUDE_FROM_ALL flag	2021-02-15 13:04:32 +01:00