Add NO_CACHE option (#128)

* add NO_CACHE option

* add unit test

.github/workflows/macos.yml

@@ -0,0 +1,22 @@
+name: MacOS
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+
+    runs-on: macos-latest
+    
+    steps:
+    - uses: actions/checkout@v1
+    
+    - name: run tests
+      run: |
+        cmake -Htest -Bbuild/test
+        cmake --build build/test --target test-verbose

.github/workflows/publish.yaml

@@ -0,0 +1,21 @@
+name: Publish
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  build:
+    name: Publish CPM.cmake
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Upload CPM.cmake to release
+        uses: svenstaro/upload-release-action@v1-release
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: cmake/CPM.cmake
+          asset_name: CPM.cmake
+          tag: ${{ github.ref }}
+          overwrite: true

.github/workflows/ubuntu.yml

@@ -0,0 +1,29 @@
+name: Ubuntu
+
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+    branches:
+    - master
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    
+    steps:
+    - uses: actions/checkout@v1
+    
+    - name: install updates
+      run: |
+        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
+    
+    - name: run tests
+      run: |
+        cmake -Htest -Bbuild/test
+        cmake --build build/test --target test-verbose

.github/workflows/windows.yml

@@ -0,0 +1,22 @@
+name: Windows
+
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+    branches:
+    - master
+
+jobs:
+  build:
+
+    runs-on: windows-latest
+    
+    steps:
+    - uses: actions/checkout@v1
+    
+    - name: run tests
+      run: |
+        cmake -Htest -Bbuild/test
+        cmake --build build/test --target test-verbose

.travis.yml

@@ -45,6 +45,6 @@ before_install:
 script:
   # unit tests
   - cmake -Htest -Bbuild/test
-  - CTEST_OUTPUT_ON_FAILURE=1 cmake --build build/test --target test
-  # examples
+  - cmake --build build/test --target test-verbose
+  # build examples
   - python3 examples/build_all.py

README.md

@@ -1,4 +1,7 @@
-[![Build Status](https://travis-ci.com/TheLartians/CPM.svg?branch=master)](https://travis-ci.com/TheLartians/CPM)
+[![Build Status](https://travis-ci.com/TheLartians/CPM.cmake.svg?branch=master)](https://travis-ci.com/TheLartians/CPM.cmake)
+[![Actions Status](https://github.com/TheLartians/CPM.cmake/workflows/MacOS/badge.svg)](https://github.com/TheLartians/CPM.cmake/actions)
+[![Actions Status](https://github.com/TheLartians/CPM.cmake/workflows/Windows/badge.svg)](https://github.com/TheLartians/CPM.cmake/actions)
+[![Actions Status](https://github.com/TheLartians/CPM.cmake/workflows/Ubuntu/badge.svg)](https://github.com/TheLartians/CPM.cmake/actions)
 
 <p align="center">
   <img src="./logo/CPM.png" height="100" />
@@ -6,40 +9,45 @@
 
 # Setup-free CMake dependency management
 
-CPM is a CMake script that adds dependency management capabilities to CMake.
-It's built as a wrapper around CMake's [FetchContent](https://cmake.org/cmake/help/latest/module/FetchContent.html) module that adds version control and a simple API.
+CPM.cmake is a CMake script that adds dependency management capabilities to CMake.
+It's built as a thin wrapper around CMake's [FetchContent](https://cmake.org/cmake/help/latest/module/FetchContent.html) module that adds version control, caching and a simple API.
 
 ## Manage everything
 
-Anything can be added as a version-controlled dependency though CPM, no packaging required.
-Projects using CMake are automatically configured and their targets can be used immediately.
-For everything else, a target can be created manually (see below).
+Any downloadable project or resource can be added as a version-controlled dependency though CPM, it is not necessary to modify or package anything.
+Projects using modern CMake are automatically configured and their targets can be used immediately.
+For everything else, the targets can be created manually after the dependency has been downloaded (see the [snippets](#snippets) below for examples).
 
 ## 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(
-  NAME          # The unique name of the dependency (should be the main target's name)
+  NAME          # The unique name of the dependency (should be the exported target's name)
   VERSION       # The minimum version of the dependency (optional, defaults to 0)
   OPTIONS       # Configuration options passed to the dependency (optional)
   DOWNLOAD_ONLY # If set, the project is downloaded, but not configured (optional)
-  [...]         # Origin paramters forwarded to FetchContent_Declare, see below
+  [...]         # Origin parameters forwarded to FetchContent_Declare, see below
 )
 ```
 
 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.
-`GIT_TAG` can also be set to a specific commit or a branch name such as `master` to download the most recent version.
+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).
 
-Besides downloading and to configuring the dependency, 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`.
+- `<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`.
+
+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
 
@@ -65,7 +73,7 @@ CPMAddPackage(
 target_link_libraries(tests Catch2)
 ```
 
-See the [examples directory](https://github.com/TheLartians/CPM/tree/master/examples) for more many examples with source code or the [wiki](https://github.com/TheLartians/CPM/wiki/More-Snippets) for many example snippets.
+See the [examples directory](https://github.com/TheLartians/CPM.cmake/tree/master/examples) for complete examples with source code or the [wiki](https://github.com/TheLartians/CPM.cmake/wiki/More-Snippets) for example snippets.
 
 ## Adding CPM
 
@@ -73,51 +81,95 @@ To add CPM to your current project, simply add `cmake/CPM.cmake` to your project
 
 ```bash
 mkdir -p cmake
-wget -O cmake/CPM.cmake https://raw.githubusercontent.com/TheLartians/CPM/master/cmake/CPM.cmake
+wget -O cmake/CPM.cmake https://github.com/TheLartians/CPM.cmake/releases/latest/download/CPM.cmake
 ```
 
-You can even use CMake to download CPM for you. See the [wiki](https://github.com/TheLartians/CPM/wiki/Adding-CPM) for more details.
+You can also use CMake to download CPM for you. See the [wiki](https://github.com/TheLartians/CPM.cmake/wiki/Downloading-CPM.cmake-in-CMake) for more details.
 
 ## Updating CPM
 
-To update CPM to the newest version, update the script in the project's root directory, for example by running the command above. Dependencies using CPM will automatically use the updated script of the outermost project.
+To update CPM to the newest version, update the script in the project's root directory, for example by running the command above.
+Dependencies using CPM will automatically use the updated script of the outermost project.
 
 ## Advantages
 
-- **Small and reusable projects** CPM takes care of all project dependencies, allowing developers to focus on creating small, well-tested frameworks.
-- **Cross-Platform** CPM adds projects via `add_subdirectory`, which is compatible with all CMake toolchains and generators.
-- **Reproducable builds** By using versioning via git tags it is ensured that a project will always be in the same state everywhere.
-- **Recursive dependencies** Ensures that no dependency is added twice and is added in the minimum required version.
+- **Small and reusable projects** CPM takes care of all project dependencies, allowing developers to focus on creating small, well-tested libraries.
+- **Cross-Platform** CPM adds projects directly at the configure stage and is compatible with all CMake toolchains and generators.
+- **Reproducible builds** By versioning dependencies via git commits or tags it is ensured that a project will always be buildable.
+- **Recursive dependencies** Ensures that no dependency is added twice and all are added in the minimum required version.
 - **Plug-and-play** No need to install anything. Just add the script to your project and you're good to go.
-- **No packaging required** There is a good chance your existing projects already work as CPM dependencies.
+- **No packaging required** Simply add all external sources as a dependency.
 - **Simple source distribution** CPM makes including projects with source files and dependencies easy, reducing the need for monolithic header files or git submodules.
 
 ## 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 [sccahe](https://github.com/mozilla/sccache) 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 best practices on preparing your projects for CPM, see the [wiki](https://github.com/TheLartians/CPM/wiki/Preparing-projects-for-CPM). 
-- **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 an error. This can be resolved by updating the outermost dependency version.
+- **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/TheLartians/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 is worth to check out fully featured C++ package managers such as [conan](https://conan.io), [vcpkg](https://github.com/microsoft/vcpkg) or [hunter](https://github.com/ruslo/hunter).
-Support for these package managers is also [planned](https://github.com/TheLartians/CPM/issues/51) for a future version of CPM.
+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).
+Dependencies added with `CPMFindPackage` should work with external package managers.
+Additionally, the option [`CPM_USE_LOCAL_PACKAGES`](#cpmuselocalpackages) will enable `find_package` for all CPM dependencies.
 
 ## Options
 
 ### CPM_SOURCE_CACHE
 
 To avoid re-downloading dependencies, CPM has an option `CPM_SOURCE_CACHE` that can be passed to CMake as `-DCPM_SOURCE_CACHE=<path to an external download directory>`.
-It can also be defined system-wide as an environmental variable, by adding `export CPM_SOURCE_CACHE=$HOME/.cache/CPM` to your `.bashrc` or `.bash_profile`.
+This will also allow projects to be configured offline, as long as the dependencies have been added to the cache before.
+It may also be defined system-wide as an environmental variable, e.g. by exporting `CPM_SOURCE_CACHE` in your `.bashrc` or `.bash_profile`.
+
+```bash
+export CPM_SOURCE_CACHE=$HOME/.cache/CPM
+```
+
 Note that passing the variable as a configure option to CMake will always override the value set by the environmental variable.
 
+### CPM_DOWNLOAD_ALL
+
+If set, CPM will forward all calls to `CPMFindPackage` as `CPMAddPackage`.
+This is useful to create reproducible builds or to determine if the source parameters have all been set correctly.
+This can also be set as an environmental variable.
+
 ### CPM_USE_LOCAL_PACKAGES
 
 CPM can be configured to use `find_package` to search for locally installed dependencies first by setting the CMake option `CPM_USE_LOCAL_PACKAGES`.
 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.
+
+## 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. 
+
+```bash
+cmake -Bbuild -DCPM_Dep_SOURCE=/path/to/dep
+```
+
+## Package lock
+
+In large projects with many transitive dependencies, it can be useful to introduce a package lock file.
+This will list all CPM.cmake dependencies and can be used to update dependencies without modifying the original `CMakeLists.txt`.
+To use a package lock, add the following line directly after including CPM.cmake.
+
+```cmake
+CPMUsePackageLock(package-lock.cmake)
+```
+
+To create or update the package lock file, build the `cpm-update-package-lock` target.
+
+```bash
+cmake -Bbuild
+cmake --build build --target cpm-update-package-lock
+```
+
+See the [wiki](https://github.com/TheLartians/CPM.cmake/wiki/Package-lock) for more info.
 
 ## Snippets
 
 These examples demonstrate how to include some well-known projects with CPM.
-See the [wiki](https://github.com/TheLartians/CPM/wiki/More-Snippets) for more snippets.
+See the [wiki](https://github.com/TheLartians/CPM.cmake/wiki/More-Snippets) for more snippets.
 
 ### [Catch2](https://github.com/catchorg/Catch2)
 
@@ -247,4 +299,4 @@ For a full example on using CPM to download and configure lua with sol2 see [her
 
 ### Full Examples
 
-See the [examples directory](https://github.com/TheLartians/CPM/tree/master/examples) for full examples with source code and check out the [wiki](https://github.com/TheLartians/CPM/wiki/More-Snippets) for many more example snippets.
+See the [examples directory](https://github.com/TheLartians/CPM.cmake/tree/master/examples) for full examples with source code and check out the [wiki](https://github.com/TheLartians/CPM.cmake/wiki/More-Snippets) for many more example snippets.

cmake/CPM.cmake

@@ -1,6 +1,6 @@
-# TheLartians/CPM - A simple Git dependency manager
-# =================================================
-# See https://github.com/TheLartians/CPM for usage and update instructions.
+# CPM.cmake - CMake's missing package manager
+# ===========================================
+# See https://github.com/TheLartians/CPM.cmake for usage and update instructions.
 #
 # MIT License
 # ----------- 
@@ -28,25 +28,41 @@
 
 cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
-set(CURRENT_CPM_VERSION 0.14) 
+set(CURRENT_CPM_VERSION 0.27)
 
 if(CPM_DIRECTORY)
-  if(NOT ${CPM_DIRECTORY} MATCHES ${CMAKE_CURRENT_LIST_DIR})
-    if (${CPM_VERSION} VERSION_LESS ${CURRENT_CPM_VERSION})
-      CPM_HANDLE_OLD_VERSION(${CURRENT_CPM_VERSION})  
+  if(NOT CPM_DIRECTORY STREQUAL CMAKE_CURRENT_LIST_DIR)
+    if (CPM_VERSION VERSION_LESS CURRENT_CPM_VERSION)
+      message(AUTHOR_WARNING "${CPM_INDENT} \
+A dependency is using a more recent CPM version (${CURRENT_CPM_VERSION}) than the current project (${CPM_VERSION}). \
+It is recommended to upgrade CPM to the most recent version. \
+See https://github.com/TheLartians/CPM.cmake for more information."
+      )
     endif()
     return()
   endif()
+
+  get_property(CPM_INITIALIZED GLOBAL "" PROPERTY CPM_INITIALIZED SET)   
+  if (CPM_INITIALIZED)
+    return()
+  endif()
 endif()
 
+set_property(GLOBAL PROPERTY CPM_INITIALIZED true) 
+
+option(CPM_USE_LOCAL_PACKAGES "Always try to use `find_package` to get dependencies" $ENV{CPM_USE_LOCAL_PACKAGES})
+option(CPM_LOCAL_PACKAGES_ONLY "Only use `find_package` to get dependencies" $ENV{CPM_LOCAL_PACKAGES_ONLY})
+option(CPM_DOWNLOAD_ALL "Always download dependencies from source" $ENV{CPM_DOWNLOAD_ALL})
+option(CPM_DONT_UPDATE_MODULE_PATH "Don't update the module path to allow using find_package" $ENV{CPM_DONT_UPDATE_MODULE_PATH})
+option(CPM_DONT_CREATE_PACKAGE_LOCK "Don't create a package lock file in the binary path" $ENV{CPM_DONT_CREATE_PACKAGE_LOCK})
+option(CPM_INCLUDE_ALL_IN_PACKAGE_LOCK "Add all packages added through CPM.cmake to the package lock" $ENV{CPM_INCLUDE_ALL_IN_PACKAGE_LOCK})
+
 set(CPM_VERSION ${CURRENT_CPM_VERSION} CACHE INTERNAL "")
 set(CPM_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} CACHE INTERNAL "")
+set(CPM_FILE ${CMAKE_CURRENT_LIST_FILE} CACHE INTERNAL "")
 set(CPM_PACKAGES "" CACHE INTERNAL "")
 set(CPM_DRY_RUN OFF CACHE INTERNAL "Don't download or configure dependencies (for testing)")
 
-option(CPM_USE_LOCAL_PACKAGES "Use locally installed packages (find_package)" OFF)
-option(CPM_LOCAL_PACKAGES_ONLY "Use only locally installed packages" OFF)
-
 if(DEFINED ENV{CPM_SOURCE_CACHE})
   set(CPM_SOURCE_CACHE_DEFAULT $ENV{CPM_SOURCE_CACHE})
 else()
@@ -55,6 +71,20 @@ endif()
 
 set(CPM_SOURCE_CACHE ${CPM_SOURCE_CACHE_DEFAULT} CACHE PATH "Directory to downlaod CPM dependencies")
 
+if (NOT CPM_DONT_UPDATE_MODULE_PATH)
+  set(CPM_MODULE_PATH "${CMAKE_BINARY_DIR}/CPM_modules" CACHE INTERNAL "")
+  # remove old modules
+  FILE(REMOVE_RECURSE ${CPM_MODULE_PATH})
+  file(MAKE_DIRECTORY ${CPM_MODULE_PATH})
+  # locally added CPM modules should override global packages
+  set(CMAKE_MODULE_PATH "${CPM_MODULE_PATH};${CMAKE_MODULE_PATH}")
+endif()
+
+if (NOT CPM_DONT_CREATE_PACKAGE_LOCK)
+  set(CPM_PACKAGE_LOCK_FILE "${CMAKE_BINARY_DIR}/cpm-package-lock.cmake" CACHE INTERNAL "")
+  file(WRITE ${CPM_PACKAGE_LOCK_FILE} "# CPM Package Lock\n# This file should be committed to version control\n\n")
+endif()
+
 include(FetchContent)
 include(CMakeParseArguments)
 
@@ -63,140 +93,317 @@ if(NOT CPM_INDENT)
   set(CPM_INDENT "CPM:")
 endif()
 
-# The main workhorse of CPM
+function(cpm_find_package NAME VERSION)
+  string(REPLACE " " ";" EXTRA_ARGS "${ARGN}")
+  find_package(${NAME} ${VERSION} ${EXTRA_ARGS} QUIET)
+  if(${CPM_ARGS_NAME}_FOUND)
+    message(STATUS "${CPM_INDENT} using local package ${CPM_ARGS_NAME}@${VERSION}")
+    CPMRegisterPackage(${CPM_ARGS_NAME} "${VERSION}")
+    set(CPM_PACKAGE_FOUND YES PARENT_SCOPE)
+  else()
+    set(CPM_PACKAGE_FOUND NO PARENT_SCOPE)
+  endif()
+endfunction()
+
+# Create a custom FindXXX.cmake module for a CPM package
+# This prevents `find_package(NAME)` from finding the system library
+function(CPMCreateModuleFile Name)
+  if (NOT CPM_DONT_UPDATE_MODULE_PATH)
+    # erase any previous modules
+    FILE(WRITE ${CPM_MODULE_PATH}/Find${Name}.cmake "include(${CPM_FILE})\n${ARGN}\nset(${Name}_FOUND TRUE)")
+  endif()
+endfunction()
+
+# Find a package locally or fallback to CPMAddPackage
+function(CPMFindPackage)
+  set(oneValueArgs
+    NAME
+    VERSION
+    FIND_PACKAGE_ARGUMENTS
+  )
+
+  cmake_parse_arguments(CPM_ARGS "" "${oneValueArgs}" "" ${ARGN})
+
+  if (NOT DEFINED CPM_ARGS_VERSION)
+    if (DEFINED CPM_ARGS_GIT_TAG) 
+      cpm_get_version_from_git_tag("${CPM_ARGS_GIT_TAG}" CPM_ARGS_VERSION)
+    endif()
+  endif()
+
+  if (CPM_DOWNLOAD_ALL)
+    CPMAddPackage(${ARGN})
+    cpm_export_variables(${CPM_ARGS_NAME})
+    return()
+  endif()
+
+  CPMCheckIfPackageAlreadyAdded(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}" "${CPM_ARGS_OPTIONS}")
+  if (CPM_PACKAGE_ALREADY_ADDED)
+    cpm_export_variables(${CPM_ARGS_NAME})
+    return()
+  endif()
+
+  cpm_find_package(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}" ${CPM_ARGS_FIND_PACKAGE_ARGUMENTS})
+
+  if(NOT CPM_PACKAGE_FOUND)
+    CPMAddPackage(${ARGN})
+    cpm_export_variables(${CPM_ARGS_NAME})
+  endif()
+
+endfunction()
+
+# checks if a package has been added before
+function(CPMCheckIfPackageAlreadyAdded 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}")
+      message(WARNING "${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 YES PARENT_SCOPE)
+    cpm_export_variables(${CPM_ARGS_NAME})
+  else()
+    SET(CPM_PACKAGE_ALREADY_ADDED NO PARENT_SCOPE)
+  endif()
+endfunction()
+
+# Download and add a package from source
 function(CPMAddPackage)
 
   set(oneValueArgs
     NAME
+    FORCE
     VERSION
     GIT_TAG
     DOWNLOAD_ONLY
     GITHUB_REPOSITORY
     GITLAB_REPOSITORY
+    GIT_REPOSITORY
     SOURCE_DIR
     DOWNLOAD_COMMAND
+    FIND_PACKAGE_ARGUMENTS
+    NO_CACHE
   )
 
   set(multiValueArgs
     OPTIONS
   )
 
-  cmake_parse_arguments(CPM_ARGS "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+  cmake_parse_arguments(CPM_ARGS "" "${oneValueArgs}" "${multiValueArgs}" "${ARGN}")
 
-  if(${CPM_USE_LOCAL_PACKAGES} OR ${CPM_LOCAL_PACKAGES_ONLY}) 
-    find_package(${CPM_ARGS_NAME} ${CPM_ARGS_VERSION} QUIET)
-
-    if(${CPM_PACKAGE_FOUND})
-      message(STATUS "CPM: adding local package ${CPM_ARGS_NAME}@${CPM_ARGS_VERSION}")
-      set_target_properties(${CPM_ARGS_NAME} 
-        PROPERTIES
-          IMPORTED_GLOBAL True
-      )
-      return()
-    endif()
-
-    if(${CPM_LOCAL_PACKAGES_ONLY}) 
-      message(SEND_ERROR "CPM: ${CPM_ARGS_NAME} not found via find_package(${CPM_ARGS_NAME} ${CPM_ARGS_VERSION})")
-    endif()
-  endif()
+  # Set default values for arguments
 
   if (NOT DEFINED CPM_ARGS_VERSION)
     if (DEFINED CPM_ARGS_GIT_TAG) 
-      CPM_GET_VERSION_FROM_GIT_TAG("${CPM_ARGS_GIT_TAG}" CPM_ARGS_VERSION)
-    endif()
-    if (NOT DEFINED CPM_ARGS_VERSION) 
-      set(CPM_ARGS_VERSION 0)
+      cpm_get_version_from_git_tag("${CPM_ARGS_GIT_TAG}" CPM_ARGS_VERSION)
     endif()
   endif()
 
-  if (NOT DEFINED CPM_ARGS_GIT_TAG)
-    set(CPM_ARGS_GIT_TAG v${CPM_ARGS_VERSION})
-  endif()
-
-  list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS GIT_TAG ${CPM_ARGS_GIT_TAG})
-
   if(CPM_ARGS_DOWNLOAD_ONLY)
     set(DOWNLOAD_ONLY ${CPM_ARGS_DOWNLOAD_ONLY})
   else()
     set(DOWNLOAD_ONLY NO)
   endif()
 
-  if (CPM_ARGS_GITHUB_REPOSITORY)
-    list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS GIT_REPOSITORY "https://github.com/${CPM_ARGS_GITHUB_REPOSITORY}.git")
+  if (DEFINED CPM_ARGS_GITHUB_REPOSITORY)
+    set(CPM_ARGS_GIT_REPOSITORY "https://github.com/${CPM_ARGS_GITHUB_REPOSITORY}.git")
   endif()
 
-  if (CPM_ARGS_GITLAB_REPOSITORY)
-    list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS GIT_REPOSITORY "https://gitlab.com/${CPM_ARGS_GITLAB_REPOSITORY}.git")
+  if (DEFINED CPM_ARGS_GITLAB_REPOSITORY)
+    list(CPM_ARGS_GIT_REPOSITORY "https://gitlab.com/${CPM_ARGS_GITLAB_REPOSITORY}.git")
   endif()
 
-  if (${CPM_ARGS_NAME} IN_LIST CPM_PACKAGES)
-    CPM_GET_PACKAGE_VERSION(${CPM_ARGS_NAME} CPM_PACKAGE_VERSION)
-    if(${CPM_PACKAGE_VERSION} VERSION_LESS ${CPM_ARGS_VERSION})
-      message(WARNING "${CPM_INDENT} requires a newer version of ${CPM_ARGS_NAME} (${CPM_ARGS_VERSION}) than currently included (${CPM_PACKAGE_VERSION}).")
+  if (DEFINED CPM_ARGS_GIT_REPOSITORY)
+    list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS GIT_REPOSITORY ${CPM_ARGS_GIT_REPOSITORY})
+    if (NOT DEFINED CPM_ARGS_GIT_TAG)
+      set(CPM_ARGS_GIT_TAG v${CPM_ARGS_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_FETCH_PACKAGE(${CPM_ARGS_NAME} ${DOWNLOAD_ONLY})
-    CPMGetProperties(${CPM_ARGS_NAME})
-    SET(${CPM_ARGS_NAME}_SOURCE_DIR "${${CPM_ARGS_NAME}_SOURCE_DIR}" PARENT_SCOPE)
-    SET(${CPM_ARGS_NAME}_BINARY_DIR "${${CPM_ARGS_NAME}_BINARY_DIR}" PARENT_SCOPE)  
-    SET(${CPM_ARGS_NAME}_ADDED NO PARENT_SCOPE)  
+  endif()
+
+  if (DEFINED CPM_ARGS_GIT_TAG)
+    list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS GIT_TAG ${CPM_ARGS_GIT_TAG})
+  endif()
+
+  # Check if package has been added before
+  CPMCheckIfPackageAlreadyAdded(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}" "${CPM_ARGS_OPTIONS}")
+  if (CPM_PACKAGE_ALREADY_ADDED)
+    cpm_export_variables(${CPM_ARGS_NAME})
     return()
   endif()
 
-  CPMRegisterPackage(${CPM_ARGS_NAME} ${CPM_ARGS_VERSION})
+  # Check for manual overrides
+  if (NOT CPM_ARGS_FORCE AND NOT "${CPM_${CPM_ARGS_NAME}_SOURCE}" STREQUAL "")
+    set(PACKAGE_SOURCE ${CPM_${CPM_ARGS_NAME}_SOURCE})
+    set(CPM_${CPM_ARGS_NAME}_SOURCE "")
+    CPMAddPackage(
+      NAME ${CPM_ARGS_NAME}
+      SOURCE_DIR ${PACKAGE_SOURCE}
+      FORCE True
+    )
+    cpm_export_variables(${CPM_ARGS_NAME})
+    return()
+  endif()
+
+  # Check for available declaration
+  if (NOT CPM_ARGS_FORCE AND NOT "${CPM_DECLARATION_${CPM_ARGS_NAME}}" STREQUAL "")
+    set(declaration ${CPM_DECLARATION_${CPM_ARGS_NAME}})
+    set(CPM_DECLARATION_${CPM_ARGS_NAME} "")
+    CPMAddPackage(${declaration})
+    cpm_export_variables(${CPM_ARGS_NAME})
+    # checking again to ensure version and option compatibility
+    CPMCheckIfPackageAlreadyAdded(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}" "${CPM_ARGS_OPTIONS}")
+    return()
+  endif()
+
+  if(CPM_USE_LOCAL_PACKAGES OR CPM_LOCAL_PACKAGES_ONLY)
+    cpm_find_package(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}" ${CPM_ARGS_FIND_PACKAGE_ARGUMENTS})
+
+    if(CPM_PACKAGE_FOUND)
+      cpm_export_variables(${CPM_ARGS_NAME})
+      return()
+    endif()
+
+    if(CPM_LOCAL_PACKAGES_ONLY) 
+      message(SEND_ERROR "CPM: ${CPM_ARGS_NAME} not found via find_package(${CPM_ARGS_NAME} ${CPM_ARGS_VERSION})")
+    endif()
+  endif()
+
+  CPMRegisterPackage("${CPM_ARGS_NAME}" "${CPM_ARGS_VERSION}")
 
   if (CPM_ARGS_OPTIONS)
     foreach(OPTION ${CPM_ARGS_OPTIONS})
-      CPM_PARSE_OPTION(${OPTION})
+      cpm_parse_option(${OPTION})
       set(${OPTION_KEY} ${OPTION_VALUE} CACHE INTERNAL "")
     endforeach()
   endif()
 
-  set(FETCH_CONTENT_DECLARE_EXTRA_OPTS "")
-
   if (DEFINED CPM_ARGS_GIT_TAG)
     set(PACKAGE_INFO "${CPM_ARGS_GIT_TAG}")
+  elseif (DEFINED CPM_ARGS_SOURCE_DIR)
+    set(PACKAGE_INFO "${CPM_ARGS_SOURCE_DIR}")
   else()
     set(PACKAGE_INFO "${CPM_ARGS_VERSION}")
   endif()
 
   if (DEFINED CPM_ARGS_DOWNLOAD_COMMAND)
-    set(FETCH_CONTENT_DECLARE_EXTRA_OPTS DOWNLOAD_COMMAND ${CPM_ARGS_DOWNLOAD_COMMAND})
-  else()
-    if (CPM_SOURCE_CACHE AND NOT DEFINED CPM_ARGS_SOURCE_DIR)
-      string(TOLOWER ${CPM_ARGS_NAME} lower_case_name)
-      set(origin_parameters ${CPM_ARGS_UNPARSED_ARGUMENTS})
-      list(SORT origin_parameters)
-      string(SHA1 origin_hash "${origin_parameters}")
-      set(download_directory ${CPM_SOURCE_CACHE}/${lower_case_name}/${origin_hash})
-      list(APPEND FETCH_CONTENT_DECLARE_EXTRA_OPTS SOURCE_DIR ${download_directory})
-      if (EXISTS ${download_directory})
-        list(APPEND FETCH_CONTENT_DECLARE_EXTRA_OPTS DOWNLOAD_COMMAND ":")
-        set(PACKAGE_INFO "${download_directory}")
-      else()
-        # remove timestamps so CMake will re-download the dependency
-        file(REMOVE_RECURSE ${CMAKE_BINARY_DIR}/_deps/${lower_case_name}-subbuild)
-        set(PACKAGE_INFO "${PACKAGE_INFO} -> ${download_directory}")
-      endif()
+    list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS DOWNLOAD_COMMAND ${CPM_ARGS_DOWNLOAD_COMMAND})
+  elseif (DEFINED CPM_ARGS_SOURCE_DIR)
+    list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS SOURCE_DIR ${CPM_ARGS_SOURCE_DIR})
+  elseif (CPM_SOURCE_CACHE AND NOT CPM_ARGS_NO_CACHE)
+    string(TOLOWER ${CPM_ARGS_NAME} lower_case_name)
+    set(origin_parameters ${CPM_ARGS_UNPARSED_ARGUMENTS})
+    list(SORT origin_parameters)
+    string(SHA1 origin_hash "${origin_parameters}")
+    set(download_directory ${CPM_SOURCE_CACHE}/${lower_case_name}/${origin_hash})
+    list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS SOURCE_DIR ${download_directory})
+    if (EXISTS ${download_directory})
+      # disable the download command to allow offline builds
+      list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS DOWNLOAD_COMMAND "${CMAKE_COMMAND}")
+      set(PACKAGE_INFO "${download_directory}")
+    else()
+      # remove timestamps so CMake will re-download the dependency
+      file(REMOVE_RECURSE ${CMAKE_BINARY_DIR}/_deps/${lower_case_name}-subbuild)
+      set(PACKAGE_INFO "${PACKAGE_INFO} -> ${download_directory}")
     endif()
   endif()
 
-  CPM_DECLARE_PACKAGE(${CPM_ARGS_NAME} ${CPM_ARGS_VERSION} ${PACKAGE_INFO} "${CPM_ARGS_UNPARSED_ARGUMENTS}" ${FETCH_CONTENT_DECLARE_EXTRA_OPTS})
-  CPM_FETCH_PACKAGE(${CPM_ARGS_NAME} ${DOWNLOAD_ONLY})
-  CPMGetProperties(${CPM_ARGS_NAME})
-  SET(${CPM_ARGS_NAME}_SOURCE_DIR "${${CPM_ARGS_NAME}_SOURCE_DIR}" PARENT_SCOPE)
-  SET(${CPM_ARGS_NAME}_BINARY_DIR "${${CPM_ARGS_NAME}_BINARY_DIR}" PARENT_SCOPE)
-  SET(${CPM_ARGS_NAME}_ADDED YES PARENT_SCOPE)  
+  CPMCreateModuleFile(${CPM_ARGS_NAME} "CPMAddPackage(${ARGN})")
+
+  if (CPM_PACKAGE_LOCK_ENABLED)
+    if ((CPM_ARGS_VERSION AND NOT CPM_ARGS_SOURCE_DIR) OR CPM_INCLUDE_ALL_IN_PACKAGE_LOCK)
+      cpm_add_to_package_lock(${CPM_ARGS_NAME} "${ARGN}")
+    elseif(CPM_ARGS_SOURCE_DIR)
+      cpm_add_comment_to_package_lock(${CPM_ARGS_NAME} "local directory")
+    else()
+      cpm_add_comment_to_package_lock(${CPM_ARGS_NAME} "${ARGN}")
+    endif()
+  endif()
+
+  cpm_declare_fetch("${CPM_ARGS_NAME}" "${CPM_ARGS_VERSION}" "${PACKAGE_INFO}" "${CPM_ARGS_UNPARSED_ARGUMENTS}")
+  cpm_fetch_package("${CPM_ARGS_NAME}" "${DOWNLOAD_ONLY}")
+  cpm_get_fetch_properties("${CPM_ARGS_NAME}")
+
+  SET(${CPM_ARGS_NAME}_ADDED YES)
+  cpm_export_variables("${CPM_ARGS_NAME}")
 endfunction()
 
-function (CPM_DECLARE_PACKAGE PACKAGE VERSION INFO)
+# Fetch a previously declared package
+macro(CPMGetPackage Name)
+  if (DEFINED "CPM_DECLARATION_${Name}")
+    CPMAddPackage(
+      NAME ${Name}
+    )
+  else()
+    message(SEND_ERROR "Cannot retrieve package ${Name}: no declaration available")
+  endif()
+endmacro()
+
+# export variables available to the caller to the parent scope
+# expects ${CPM_ARGS_NAME} to be set
+macro(cpm_export_variables name)
+  SET(${name}_SOURCE_DIR "${${name}_SOURCE_DIR}" PARENT_SCOPE)
+  SET(${name}_BINARY_DIR "${${name}_BINARY_DIR}" PARENT_SCOPE)
+  SET(${name}_ADDED "${${name}_ADDED}" PARENT_SCOPE)
+endmacro()
+
+# declares a package, so that any call to CPMAddPackage for the 
+# package name will use these arguments instead.
+# Previous declarations will not be overriden.
+macro(CPMDeclarePackage Name)
+  if (NOT DEFINED "CPM_DECLARATION_${Name}")
+    set("CPM_DECLARATION_${Name}" "${ARGN}")
+  endif()
+endmacro()
+
+function(cpm_add_to_package_lock Name)
+  if (NOT CPM_DONT_CREATE_PACKAGE_LOCK)
+    file(APPEND ${CPM_PACKAGE_LOCK_FILE} "# ${Name}\nCPMDeclarePackage(${Name} \"${ARGN}\")\n")
+  endif()
+endfunction()
+
+function(cpm_add_comment_to_package_lock Name)
+  if (NOT CPM_DONT_CREATE_PACKAGE_LOCK)
+    file(APPEND ${CPM_PACKAGE_LOCK_FILE} "# ${Name} (unversioned)\n# CPMDeclarePackage(${Name} \"${ARGN}\")\n")
+  endif()
+endfunction()
+
+# includes the package lock file if it exists and creates a target
+# `cpm-write-package-lock` to update it
+macro(CPMUsePackageLock file)
+  if (NOT CPM_DONT_CREATE_PACKAGE_LOCK)
+    get_filename_component(CPM_ABSOLUTE_PACKAGE_LOCK_PATH ${file} ABSOLUTE)
+    if(EXISTS ${CPM_ABSOLUTE_PACKAGE_LOCK_PATH})
+      include(${CPM_ABSOLUTE_PACKAGE_LOCK_PATH})
+    endif()
+    if (NOT TARGET cpm-update-package-lock)
+      add_custom_target(cpm-update-package-lock COMMAND ${CMAKE_COMMAND} -E copy ${CPM_PACKAGE_LOCK_FILE} ${CPM_ABSOLUTE_PACKAGE_LOCK_PATH})
+    endif()
+    set(CPM_PACKAGE_LOCK_ENABLED true)
+  endif()
+endmacro()
+
+# registers a package that has been added to CPM
+function(CPMRegisterPackage PACKAGE VERSION)
+  list(APPEND CPM_PACKAGES ${PACKAGE})
+  set(CPM_PACKAGES ${CPM_PACKAGES} CACHE INTERNAL "")
+  set("CPM_PACKAGE_${PACKAGE}_VERSION" ${VERSION} CACHE INTERNAL "")
+endfunction()
+
+# retrieve the current version of the package to ${OUTPUT}
+function(CPMGetPackageVersion PACKAGE OUTPUT)
+  set(${OUTPUT} "${CPM_PACKAGE_${PACKAGE}_VERSION}" PARENT_SCOPE)
+endfunction()
+
+# declares a package in FetchContent_Declare 
+function (cpm_declare_fetch PACKAGE VERSION INFO)
   message(STATUS "${CPM_INDENT} adding package ${PACKAGE}@${VERSION} (${INFO})")
 
   if (${CPM_DRY_RUN}) 
@@ -204,32 +411,13 @@ function (CPM_DECLARE_PACKAGE PACKAGE VERSION INFO)
     return()
   endif()
 
-  FetchContent_Declare(
-    ${PACKAGE}
+  FetchContent_Declare(${PACKAGE}
     ${ARGN}
   )
 endfunction()
 
-function (CPM_FETCH_PACKAGE PACKAGE DOWNLOAD_ONLY)  
-
-  if (${CPM_DRY_RUN}) 
-    message(STATUS "${CPM_INDENT} package ${PACKAGE} not fetched (dry run)")
-    return()
-  endif()
-
-  set(CPM_OLD_INDENT "${CPM_INDENT}")
-  set(CPM_INDENT "${CPM_INDENT} ${PACKAGE}:")
-  if(${DOWNLOAD_ONLY})
-    if(NOT "${PACKAGE}_POPULATED")
-      FetchContent_Populate(${PACKAGE})
-    endif()
-  else()
-    FetchContent_MakeAvailable(${PACKAGE})
-  endif()
-  set(CPM_INDENT "${CPM_OLD_INDENT}")
-endfunction()
-
-function (CPMGetProperties PACKAGE)
+# returns properties for a package previously defined by cpm_declare_fetch
+function (cpm_get_fetch_properties PACKAGE)
   if (${CPM_DRY_RUN}) 
     return()
   endif()
@@ -239,36 +427,50 @@ function (CPMGetProperties PACKAGE)
   SET(${PACKAGE}_BINARY_DIR "${${lpackage}_BINARY_DIR}" PARENT_SCOPE)
 endfunction()
 
-function(CPMRegisterPackage PACKAGE VERSION)
-  list(APPEND CPM_PACKAGES ${PACKAGE})
-  set(CPM_PACKAGES ${CPM_PACKAGES} CACHE INTERNAL "")
-  set("CPM_PACKAGE_${PACKAGE}_VERSION" ${VERSION} CACHE INTERNAL "")
+# downloads a previously declared package via FetchContent
+function (cpm_fetch_package PACKAGE DOWNLOAD_ONLY)  
+  if (${CPM_DRY_RUN}) 
+    message(STATUS "${CPM_INDENT} package ${PACKAGE} not fetched (dry run)")
+    return()
+  endif()
+
+  if(DOWNLOAD_ONLY)
+    FetchContent_GetProperties(${PACKAGE})
+    if(NOT ${PACKAGE}_POPULATED)
+      FetchContent_Populate(${PACKAGE})
+    endif()
+  else()
+    set(CPM_OLD_INDENT "${CPM_INDENT}")
+    set(CPM_INDENT "${CPM_INDENT} ${PACKAGE}:")
+    FetchContent_MakeAvailable(${PACKAGE})
+    set(CPM_INDENT "${CPM_OLD_INDENT}")
+  endif()
 endfunction()
 
-function(CPM_GET_PACKAGE_VERSION PACKAGE OUTPUT)
-  set(${OUTPUT} "${CPM_PACKAGE_${PACKAGE}_VERSION}" PARENT_SCOPE)
-endfunction()
-
-function(CPM_PARSE_OPTION OPTION)
+# splits a package option
+function(cpm_parse_option OPTION)
   string(REGEX MATCH "^[^ ]+" OPTION_KEY ${OPTION})
+  string(LENGTH ${OPTION} OPTION_LENGTH)
   string(LENGTH ${OPTION_KEY} OPTION_KEY_LENGTH)
-  math(EXPR OPTION_KEY_LENGTH "${OPTION_KEY_LENGTH}+1")
-  string(SUBSTRING ${OPTION} "${OPTION_KEY_LENGTH}" "-1" OPTION_VALUE)
+  if (OPTION_KEY_LENGTH STREQUAL OPTION_LENGTH)
+    # no value for key provided, assume user wants to set option to "ON"
+    set(OPTION_VALUE "ON")
+  else()
+    math(EXPR OPTION_KEY_LENGTH "${OPTION_KEY_LENGTH}+1")
+    string(SUBSTRING ${OPTION} "${OPTION_KEY_LENGTH}" "-1" OPTION_VALUE)
+  endif()
   set(OPTION_KEY "${OPTION_KEY}" PARENT_SCOPE)
   set(OPTION_VALUE "${OPTION_VALUE}" PARENT_SCOPE)
 endfunction()
 
-function(CPM_GET_VERSION_FROM_GIT_TAG GIT_TAG RESULT)
-  string(REGEX MATCH "v?([0123456789.]*).*" _ ${GIT_TAG})
-  SET(${RESULT} ${CMAKE_MATCH_1} PARENT_SCOPE)
-endfunction()
-
-function (CPM_HANDLE_OLD_VERSION NEW_CPM_VERSION)
-  
-  message(AUTHOR_WARNING "${CPM_INDENT} \
-A dependency is using a more recent CPM (${NEW_CPM_VERSION}) than the current project (${CPM_VERSION}). \
-It is recommended to upgrade CPM to the most recent version. \
-See https://github.com/TheLartians/CPM for more information."
-  )
-
+# guesses the package version from a git tag
+function(cpm_get_version_from_git_tag GIT_TAG RESULT)
+  string(LENGTH ${GIT_TAG} length)
+  if (length EQUAL 40) 
+    # GIT_TAG is probably a git hash
+    SET(${RESULT} 0 PARENT_SCOPE)
+  else()
+    string(REGEX MATCH "v?([0123456789.]*).*" _ ${GIT_TAG})
+    SET(${RESULT} ${CMAKE_MATCH_1} PARENT_SCOPE)
+  endif()
 endfunction()

cmake/testing.cmake

@@ -20,3 +20,15 @@ endfunction()
 function(ASSERTION_FAILED)
   message(FATAL_ERROR "assertion failed: ${ARGN}")
 endfunction()
+
+function(ASSERT_EXISTS file)
+  if (NOT EXISTS ${file}) 
+    message(FATAL_ERROR "assertion failed: file ${file} does not exist")
+  endif()
+endfunction()
+
+function(ASSERT_NOT_EXISTS file)
+  if (EXISTS ${file}) 
+    message(FATAL_ERROR "assertion failed: file ${file} exists")
+  endif()
+endfunction()

examples/benchmark/CMakeLists.txt

@@ -9,13 +9,13 @@ include(../../cmake/CPM.cmake)
 CPMAddPackage(
   NAME fibonacci
   GIT_REPOSITORY https://github.com/TheLartians/Fibonacci.git
-  VERSION 1.0
+  VERSION 2.0
 )
 
 CPMAddPackage(
   NAME benchmark
   GITHUB_REPOSITORY google/benchmark
-  VERSION 1.4.1
+  VERSION 1.5.0
   OPTIONS
     "BENCHMARK_ENABLE_TESTING Off"
 )

examples/benchmark/main.cpp

@@ -15,14 +15,14 @@ std::vector<unsigned> createTestNumbers(){
   return v;
 }
 
-void fibonnacci(benchmark::State& state) {
+void fibonacci(benchmark::State& state) {
   auto numbers = createTestNumbers();
   for (auto _ : state) {
-    for (auto v: numbers) benchmark::DoNotOptimize(fibonnacci(v));
+    for (auto v: numbers) benchmark::DoNotOptimize(fibonacci(v));
   }
 }
 
-BENCHMARK(fibonnacci);
+BENCHMARK(fibonacci);
 
 void fastFibonacci(benchmark::State& state) {
   auto numbers = createTestNumbers();

examples/boost/CMakeLists.txt

@@ -11,10 +11,11 @@ set_target_properties(CPMExampleBoost PROPERTIES CXX_STANDARD 17)
 
 include(../../cmake/CPM.cmake)
 
-CPMAddPackage(
-  NAME boost
+CPMFindPackage(
+  NAME Boost
   GITHUB_REPOSITORY Orphis/boost-cmake
   VERSION 1.67.0
+  FIND_PACKAGE_ARGUMENTS "COMPONENTS system"
 )
 
 target_link_libraries(CPMExampleBoost PRIVATE Boost::system pthread)

examples/catch2/CMakeLists.txt

@@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
 project(CPMExampleCatch2)
 
-# ---- Options ----
-
-option(ENABLE_TEST_COVERAGE "Enable test coverage" OFF)
-
 # ---- Dependencies ----
 
 include(../../cmake/CPM.cmake)
@@ -13,7 +9,7 @@ include(../../cmake/CPM.cmake)
 CPMAddPackage(
   NAME fibonacci
   GIT_REPOSITORY https://github.com/TheLartians/Fibonacci.git
-  VERSION 1.0
+  VERSION 2.0
 )
 
 CPMAddPackage(
@@ -26,16 +22,9 @@ CPMAddPackage(
 
 add_executable(CPMExampleCatch2 main.cpp)
 target_link_libraries(CPMExampleCatch2 fibonacci Catch2)
-set_target_properties(CPMExampleCatch2 PROPERTIES CXX_STANDARD 17 COMPILE_FLAGS "-Wall -pedantic -Wextra -Werror")
+set_target_properties(CPMExampleCatch2 PROPERTIES CXX_STANDARD 17)
 
 # ---- Enable testing ----
 
 ENABLE_TESTING() 
 ADD_TEST(CPMExampleCatch2 CPMExampleCatch2)
-
-# ---- Add code coverage ----
-
-if (${ENABLE_TEST_COVERAGE})
-  set_target_properties(CPMExampleCatch2 PROPERTIES CXX_STANDARD 17 COMPILE_FLAGS "-O0 -g -fprofile-arcs -ftest-coverage --coverage")
-  target_link_options(CPMExampleCatch2 PUBLIC "--coverage")
-endif()

examples/catch2/main.cpp

@@ -3,18 +3,18 @@
 #include <catch2/catch.hpp>
 #include <fibonacci.h>
 
-TEST_CASE("fibonnacci"){
-  REQUIRE(fibonnacci(0) == 0);
-  REQUIRE(fibonnacci(1) == 1);
-  REQUIRE(fibonnacci(2) == 1);
-  REQUIRE(fibonnacci(3) == 2);
-  REQUIRE(fibonnacci(4) == 3);
-  REQUIRE(fibonnacci(5) == 5);
-  REQUIRE(fibonnacci(13) == 233);
+TEST_CASE("fibonacci"){
+  REQUIRE(fibonacci(0) == 0);
+  REQUIRE(fibonacci(1) == 1);
+  REQUIRE(fibonacci(2) == 1);
+  REQUIRE(fibonacci(3) == 2);
+  REQUIRE(fibonacci(4) == 3);
+  REQUIRE(fibonacci(5) == 5);
+  REQUIRE(fibonacci(13) == 233);
 }
 
-TEST_CASE("fastFibonnacci"){
+TEST_CASE("fastFibonacci"){
   for (unsigned i=0; i<25; ++i){
-    REQUIRE(fibonnacci(i) == fastFibonacci(i));
+    REQUIRE(fibonacci(i) == fastFibonacci(i));
   }
 }

examples/cxxopts/CMakeLists.txt

@@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
 project(CPMExampleCXXOpts)
 
-# ---- Options ----
-
-option(ENABLE_TEST_COVERAGE "Enable test coverage" OFF)
-
 # ---- Dependencies ----
 
 include(../../cmake/CPM.cmake)
@@ -23,4 +19,4 @@ CPMAddPackage(
 
 add_executable(CPMExampleCXXOpts main.cpp)
 target_link_libraries(CPMExampleCXXOpts cxxopts)
-set_target_properties(CPMExampleCXXOpts PROPERTIES CXX_STANDARD 17 COMPILE_FLAGS "-Wall -pedantic -Wextra -Werror")
+set_target_properties(CPMExampleCXXOpts PROPERTIES CXX_STANDARD 17)

examples/doctest/CMakeLists.txt

@@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
 project(CPMExampleDoctest)
 
-# ---- Options ----
-
-option(ENABLE_TEST_COVERAGE "Enable test coverage" OFF)
-
 # ---- Dependencies ----
 
 include(../../cmake/CPM.cmake)
@@ -13,7 +9,7 @@ include(../../cmake/CPM.cmake)
 CPMAddPackage(
   NAME fibonacci
   GIT_REPOSITORY https://github.com/TheLartians/Fibonacci.git
-  VERSION 1.0
+  VERSION 2.0
 )
 
 CPMAddPackage(
@@ -26,16 +22,9 @@ CPMAddPackage(
 
 add_executable(CPMExampleDoctest main.cpp)
 target_link_libraries(CPMExampleDoctest fibonacci doctest)
-set_target_properties(CPMExampleDoctest PROPERTIES CXX_STANDARD 17 COMPILE_FLAGS "-Wall -pedantic -Wextra -Werror")
+set_target_properties(CPMExampleDoctest PROPERTIES CXX_STANDARD 17)
 
 # ---- Enable testing ----
 
 ENABLE_TESTING() 
 ADD_TEST(CPMExampleDoctest CPMExampleDoctest)
-
-# ---- Add code coverage ----
-
-if (${ENABLE_TEST_COVERAGE})
-  set_target_properties(CPMExampleDoctest PROPERTIES CXX_STANDARD 17 COMPILE_FLAGS "-O0 -g -fprofile-arcs -ftest-coverage --coverage")
-  target_link_options(CPMExampleDoctest PUBLIC "--coverage")
-endif()

examples/doctest/main.cpp

@@ -3,18 +3,18 @@
 #include <doctest/doctest.h>
 #include <fibonacci.h>
 
-TEST_CASE("fibonnacci"){
-  CHECK(fibonnacci(0) == 0);
-  CHECK(fibonnacci(1) == 1);
-  CHECK(fibonnacci(2) == 1);
-  CHECK(fibonnacci(3) == 2);
-  CHECK(fibonnacci(4) == 3);
-  CHECK(fibonnacci(5) == 5);
-  CHECK(fibonnacci(13) == 233);
+TEST_CASE("fibonacci"){
+  CHECK(fibonacci(0) == 0);
+  CHECK(fibonacci(1) == 1);
+  CHECK(fibonacci(2) == 1);
+  CHECK(fibonacci(3) == 2);
+  CHECK(fibonacci(4) == 3);
+  CHECK(fibonacci(5) == 5);
+  CHECK(fibonacci(13) == 233);
 }
 
-TEST_CASE("fastFibonnacci"){
+TEST_CASE("fastfibonacci"){
   for (unsigned i=0; i<25; ++i){
-    CHECK(fibonnacci(i) == fastFibonacci(i));
+    CHECK(fibonacci(i) == fastFibonacci(i));
   }
 }

examples/fmt/CMakeLists.txt

@@ -0,0 +1,19 @@
+cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
+
+project(CPMJSONExample)
+
+# ---- Dependencies ----
+
+include(../../cmake/CPM.cmake)
+
+CPMAddPackage(
+  NAME fmt
+  GIT_TAG 6.1.2
+  GITHUB_REPOSITORY fmtlib/fmt
+)
+
+# ---- Executable ----
+
+add_executable(CPMFmtExample "main.cpp")
+set_target_properties(CPMFmtExample PROPERTIES CXX_STANDARD 17)        
+target_link_libraries(CPMFmtExample fmt)

examples/fmt/main.cpp

@@ -0,0 +1,6 @@
+#include <fmt/format.h>
+
+int main(){
+  fmt::print("Hello, {}!\n", "world");
+  return 0;
+}

examples/gtest/CMakeLists.txt

@@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
 project(CPMExampleGtest)
 
-# ---- Options ----
-
-option(ENABLE_TEST_COVERAGE "Enable test coverage" OFF)
-
 # ---- Dependencies ----
 
 include(../../cmake/CPM.cmake)
@@ -13,7 +9,7 @@ include(../../cmake/CPM.cmake)
 CPMAddPackage(
   NAME fibonacci
   GIT_REPOSITORY https://github.com/TheLartians/Fibonacci.git
-  VERSION 1.0
+  VERSION 2.0
 )
 
 CPMAddPackage(
@@ -23,7 +19,7 @@ CPMAddPackage(
   VERSION 1.8.1
   OPTIONS
       "INSTALL_GTEST OFF"
-      "gtest_force_shared_crt ON"
+      "gtest_force_shared_crt"
 )
 
 # ---- Create binary ----
@@ -36,10 +32,3 @@ set_target_properties(CPMExampleGtest PROPERTIES CXX_STANDARD 17)
 
 enable_testing() 
 add_test(CPMExampleGtest CPMExampleGtest)
-
-# ---- Add code coverage ----
-
-if (${ENABLE_TEST_COVERAGE})
-  set_target_properties(CPMExampleGtest PROPERTIES CXX_STANDARD 17 COMPILE_FLAGS "-O0 -g -fprofile-arcs -ftest-coverage --coverage")
-  target_link_options(CPMExampleGtest PUBLIC "--coverage")
-endif()

examples/gtest/main.cpp

@@ -3,11 +3,11 @@
 
 TEST(FibonacciTests, BasicChecks)
 {
-  ASSERT_TRUE(fibonnacci(0) == 0);
-  ASSERT_TRUE(fibonnacci(1) == 1);
-  ASSERT_TRUE(fibonnacci(2) == 1);
-  ASSERT_TRUE(fibonnacci(3) == 2);
-  ASSERT_TRUE(fibonnacci(4) == 3);
-  ASSERT_TRUE(fibonnacci(5) == 5);
-  ASSERT_TRUE(fibonnacci(13) == 233);
+  ASSERT_TRUE(fibonacci(0) == 0);
+  ASSERT_TRUE(fibonacci(1) == 1);
+  ASSERT_TRUE(fibonacci(2) == 1);
+  ASSERT_TRUE(fibonacci(3) == 2);
+  ASSERT_TRUE(fibonacci(4) == 3);
+  ASSERT_TRUE(fibonacci(5) == 5);
+  ASSERT_TRUE(fibonacci(13) == 233);
 }

examples/parser-lua/CMakeLists.txt

@@ -1,30 +0,0 @@
-cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
-
-project(CPMParserLuaExample)
-
-include(../../cmake/CPM.cmake)
-
-# ---- Dependencies ----
-
-CPMAddPackage(
-  NAME Glue
-  GIT_REPOSITORY https://github.com/TheLartians/Glue.git
-  VERSION 0.8.2
-  OPTIONS 
-    "GLUE_ENABLE_LUA ON"
-    "GLUE_BUILD_LUA ON"
-)
-
-CPMAddPackage(
-  NAME LarsParser
-  GIT_REPOSITORY https://github.com/TheLartians/Parser.git
-  VERSION 1.9
-  OPTIONS 
-    "LARS_PARSER_BUILD_GLUE_EXTENSION ON"
-)
-
-# ---- Create binary ----
-
-add_executable(parser-lua main.cpp)
-set_target_properties(parser-lua PROPERTIES CXX_STANDARD 17)
-target_link_libraries(parser-lua LHC LarsParser Glue)

examples/parser-lua/main.cpp

@@ -1,46 +0,0 @@
-#include <lars/parser/extension.h>
-#include <glue/lua.h>
-#include <stdexcept>
-#include <iostream>
-
-int main() {
-  auto lua = glue::LuaState();
-  lua.openStandardLibs();
-
-  lua["parser"] = lars::glue::parser();
-  
-  lua.run(R"(
-    wordParser = parser.Program.create()
-
-    wordParser:setRule("Whitespace", "[ \t]")
-    wordParser:setSeparatorRule("Whitespace")
-
-    wordParser:setRule("Word", "[a-zA-Z]+")
-    
-    wordParser:setRuleWithCallback("Words", "Word*", function(e) 
-      local N = e:size()
-      local res = {}
-      for i=0,N-1 do res[#res+1] = e:get(i):string() end
-      return res
-    end)
-
-    wordParser:setStartRule("Words")
-  )");
-
-  lua.run(R"(
-    while true do
-      print("please enter some words or 'quit' to exit");
-      local input = io.read();
-      if input == "quit" then os.exit() end
-      local result
-      ok, err = pcall(function() result = wordParser:run(input) end)
-      if ok then
-        print("you entered " .. #result .. " words!")
-      else 
-        print("error: " .. tostring(err))
-      end
-    end
-  )");
-
-  return 0;
-}

examples/parser/CMakeLists.txt

@@ -1,17 +0,0 @@
-cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
-
-project(CPMParserExample)
-
-# add dependencies
-include(../../cmake/CPM.cmake)
-
-CPMAddPackage(
-  NAME LarsParser
-  GIT_REPOSITORY https://github.com/TheLartians/Parser.git
-  VERSION 1.7
-)
-
-# add executable
-add_executable(calculator main.cpp)
-set_target_properties(calculator PROPERTIES CXX_STANDARD 17)
-target_link_libraries(calculator LarsParser)

examples/parser/main.cpp

@@ -1,57 +0,0 @@
-#include <iostream>
-#include <unordered_map>
-#include <cmath>
-
-#include <lars/parser/generator.h>
-
-int main() {
-  using namespace std;
-  using VariableMap = unordered_map<string, float>;
-  
-  lars::ParserGenerator<float, VariableMap &> calculator;
-  
-  auto &g = calculator;
-  g.setSeparator(g["Whitespace"] << "[\t ]");
-
-  g["Expression"] << "Set | Sum";
-  g["Set"       ] << "Name '=' Sum" >> [](auto e, auto &v){ return v[e[0].string()] = e[1].evaluate(v); };
-  g["Sum"       ] << "Add | Subtract | Product";
-  g["Product"   ] << "Multiply | Divide | Exponent";
-  g["Exponent"  ] << "Power | Atomic";
-  g["Atomic"    ] << "Number | Brackets | Variable";
-  g["Brackets"  ] << "'(' Sum ')'";
-  g["Add"       ] << "Sum '+' Product"       >> [](auto e, auto &v){ return e[0].evaluate(v) + e[1].evaluate(v); };
-  g["Subtract"  ] << "Sum '-' Product"       >> [](auto e, auto &v){ return e[0].evaluate(v) - e[1].evaluate(v); };
-  g["Multiply"  ] << "Product '*' Exponent"  >> [](auto e, auto &v){ return e[0].evaluate(v) * e[1].evaluate(v); };
-  g["Divide"    ] << "Product '/' Exponent"  >> [](auto e, auto &v){ return e[0].evaluate(v) / e[1].evaluate(v); };
-  g["Power"     ] << "Atomic ('^' Exponent)" >> [](auto e, auto &v){ return pow(e[0].evaluate(v), e[1].evaluate(v)); };
-  g["Variable"  ] << "Name" >> [](auto e, auto &v){ return v[e[0].string()]; };
-  g["Name"      ] << "[a-zA-Z] [a-zA-Z0-9]*";
-  g["Number"    ] << "'-'? [0-9]+ ('.' [0-9]+)?" >> [](auto e, auto &){ return stod(e.string()); };
-
-  g.setStart(g["Expression"]);
-
-  cout << "Enter an expression to be evaluated or 'quit' to exit.\n";
-
-  VariableMap variables;
-
-  while (true) {
-    string str;
-    cout << "> ";
-    getline(cin,str);
-    if(str == "q" || str == "quit"){ break; }
-    try {
-      auto result = calculator.run(str, variables);
-      cout << str << " = " << result << endl;
-    } catch (lars::SyntaxError &error) {
-      auto syntax = error.syntax;
-      cout << "  ";
-      cout << string(syntax->begin, ' ');
-      cout << string(syntax->length(), '~');
-      cout << "^\n";
-      cout << "  " << "Syntax error while parsing " << syntax->rule->name << endl;
-    }
-  }
-
-  return 0;
-}

test/CMakeLists.txt

@@ -14,4 +14,4 @@ foreach(test ${tests})
   )
 endforeach()
 
-add_custom_target(test-verbose COMMAND ${CMAKE_CTEST_COMMAND} --verbose)
+add_custom_target(test-verbose COMMAND ${CMAKE_CTEST_COMMAND} -C Debug --verbose)

test/unit/cache.cmake

@@ -3,16 +3,13 @@ cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 include(${CPM_PATH}/testing.cmake)
 include(CMakePackageConfigHelpers)
 
-
 set(CPM_SOURCE_CACHE_DIR "${CMAKE_CURRENT_BINARY_DIR}/CPM")
 set(TEST_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/cache)
 
 function(clear_cache)
+  message(STATUS "clearing CPM cache")
   FILE(REMOVE_RECURSE ${CPM_SOURCE_CACHE_DIR})
-  
-  if (EXISTS "${CPM_SOURCE_CACHE_DIR}")
-    ASSERTION_FAILED("cache not cleared")
-  endif()
+  ASSERT_NOT_EXISTS("${CPM_SOURCE_CACHE_DIR}")
 endfunction()
 
 function(update_cmake_lists)
@@ -29,7 +26,7 @@ function(reset_test)
   update_cmake_lists()
 endfunction()
 
-set(CATCH2_VERSION 2.8.0)
+set(FIBONACCI_VERSION 1.0)
 
 ## Read CPM_SOURCE_CACHE from arguments
 
@@ -42,14 +39,11 @@ execute_process(
 )
 
 ASSERT_EQUAL(${ret} "0")
+ASSERT_EXISTS("${CPM_SOURCE_CACHE_DIR}/fibonacci")
 
-if (NOT EXISTS "${CPM_SOURCE_CACHE_DIR}/catch2")
-  ASSERTION_FAILED("catch2 not in cache")
-endif()
-
-FILE(GLOB catch2_versions "${CPM_SOURCE_CACHE_DIR}/catch2/*")
-list(LENGTH catch2_versions catch2_version_count)
-ASSERT_EQUAL(${catch2_version_count} "1")
+FILE(GLOB FIBONACCI_VERSIONs "${CPM_SOURCE_CACHE_DIR}/fibonacci/*")
+list(LENGTH FIBONACCI_VERSIONs FIBONACCI_VERSION_count)
+ASSERT_EQUAL(${FIBONACCI_VERSION_count} "1")
 
 FILE(GLOB fibonacci_versions "${CPM_SOURCE_CACHE_DIR}/fibonacci/*")
 list(LENGTH fibonacci_versions fibonacci_version_count)
@@ -57,7 +51,7 @@ ASSERT_EQUAL(${fibonacci_version_count} "1")
 
 ## Update dependency and keep CPM_SOURCE_CACHE
 
-set(CATCH2_VERSION 2.9.0)
+set(FIBONACCI_VERSION 2.0)
 update_cmake_lists()
 
 execute_process(
@@ -68,13 +62,9 @@ execute_process(
 
 ASSERT_EQUAL(${ret} "0")
 
-FILE(GLOB catch2_versions "${CPM_SOURCE_CACHE_DIR}/catch2/*")
-list(LENGTH catch2_versions catch2_version_count)
-ASSERT_EQUAL(${catch2_version_count} "2")
-
-FILE(GLOB fibonacci_versions "${CPM_SOURCE_CACHE_DIR}/fibonacci/*")
-list(LENGTH fibonacci_versions fibonacci_version_count)
-ASSERT_EQUAL(${fibonacci_version_count} "1")
+FILE(GLOB FIBONACCI_VERSIONs "${CPM_SOURCE_CACHE_DIR}/fibonacci/*")
+list(LENGTH FIBONACCI_VERSIONs FIBONACCI_VERSION_count)
+ASSERT_EQUAL(${FIBONACCI_VERSION_count} "2")
 
 ## Clear cache and update
 
@@ -87,10 +77,7 @@ execute_process(
 )
 
 ASSERT_EQUAL(${ret} "0")
-
-if (NOT EXISTS "${CPM_SOURCE_CACHE_DIR}/catch2")
-  ASSERTION_FAILED("catch2 not in cache")
-endif()
+ASSERT_EXISTS("${CPM_SOURCE_CACHE_DIR}/fibonacci")
 
 ## Read CPM_SOURCE_CACHE from environment
 
@@ -103,10 +90,17 @@ execute_process(
 )
 
 ASSERT_EQUAL(${ret} "0")
+ASSERT_EXISTS("${CPM_SOURCE_CACHE_DIR}/fibonacci")
 
-if (NOT EXISTS "${CPM_SOURCE_CACHE_DIR}/catch2")
-  ASSERTION_FAILED("catch2 not in cache")
-endif()
+## Reuse cached packages for other build
+
+execute_process(
+  COMMAND 
+  ${CMAKE_COMMAND} -E env "CPM_SOURCE_CACHE=${CPM_SOURCE_CACHE_DIR}" ${CMAKE_COMMAND} "-H${CMAKE_CURRENT_LIST_DIR}/cache" "-B${TEST_BUILD_DIR}-2"
+  RESULT_VARIABLE ret
+)
+
+ASSERT_EQUAL(${ret} "0")
 
 ## Overwrite CPM_SOURCE_CACHE with argument
 
@@ -119,7 +113,19 @@ execute_process(
 )
 
 ASSERT_EQUAL(${ret} "0")
+ASSERT_EXISTS("${CPM_SOURCE_CACHE_DIR}/fibonacci")
 
-if (NOT EXISTS "${CPM_SOURCE_CACHE_DIR}/catch2")
-  ASSERTION_FAILED("catch2 not in cache")
-endif()
+## Use NO_CACHE option
+
+set(FIBONACCI_PACKAGE_ARGS "NO_CACHE YES")
+update_cmake_lists()
+reset_test()
+
+execute_process(
+  COMMAND 
+  ${CMAKE_COMMAND} -E env "CPM_SOURCE_CACHE=${CPM_SOURCE_CACHE_DIR}" ${CMAKE_COMMAND} "-H${CMAKE_CURRENT_LIST_DIR}/cache" "-B${TEST_BUILD_DIR}"
+  RESULT_VARIABLE ret
+)
+
+ASSERT_EQUAL(${ret} "0")
+ASSERT_NOT_EXISTS("${CPM_SOURCE_CACHE_DIR}/fibonacci")

test/unit/cache/CMakeLists.txt.in

@@ -13,18 +13,12 @@ include(@CPM_PATH@/CPM.cmake)
 CPMAddPackage(
   NAME fibonacci
   GIT_REPOSITORY https://github.com/TheLartians/Fibonacci.git
-  VERSION 1.0
-)
-
-CPMAddPackage(
-  NAME Catch2
-  GITHUB_REPOSITORY catchorg/Catch2
-  VERSION @CATCH2_VERSION@
-  GIT_SHALLOW YES
+  VERSION @FIBONACCI_VERSION@
+  @FIBONACCI_PACKAGE_ARGS@
 )
 
 # ---- Create binary ----
 
 add_executable(CPMExampleCatch2 main.cpp)
-target_link_libraries(CPMExampleCatch2 fibonacci Catch2)
+target_link_libraries(CPMExampleCatch2 fibonacci)
 set_target_properties(CPMExampleCatch2 PROPERTIES CXX_STANDARD 17 COMPILE_FLAGS "-Wall -pedantic -Wextra -Werror")

test/unit/cache/main.cpp

@@ -1,13 +1,9 @@
 #define CATCH_CONFIG_MAIN
 
-#include <catch2/catch.hpp>
 #include <fibonacci.h>
+#include <iostream>
 
-TEST_CASE("fibonnacci"){
-  REQUIRE(fibonnacci(0) == 0);
-  REQUIRE(fibonnacci(1) == 1);
-  REQUIRE(fibonnacci(2) == 1);
-  REQUIRE(fibonnacci(3) == 2);
-  REQUIRE(fibonnacci(4) == 3);
-  REQUIRE(fibonnacci(5) == 5);
+int main(){
+  std::cout << "fib(10) = " << fastFibonacci(10) << std::endl;
+  return 0;
 }

test/unit/dependency_properties.cmake

@@ -15,7 +15,7 @@ CPMAddPackage(
   VERSION 1.2.3
 )
 
-CPM_GET_PACKAGE_VERSION(A VERSION)
+CPMGetPackageVersion(A VERSION)
 ASSERT_EQUAL(${VERSION} "1.2.3")
 
 CPMAddPackage(
@@ -28,7 +28,7 @@ CPMAddPackage(
   GIT_TAG v2.3.1
 )
 
-CPM_GET_PACKAGE_VERSION(B VERSION)
+CPMGetPackageVersion(B VERSION)
 ASSERT_EQUAL(${VERSION} "2.4.1")
 
 CPMAddPackage(
@@ -37,5 +37,5 @@ CPMAddPackage(
   VERSION 3.1.2
 )
 
-CPM_GET_PACKAGE_VERSION(C VERSION)
+CPMGetPackageVersion(C VERSION)
 ASSERT_EQUAL(${VERSION} "3.1.2")

test/unit/modules.cmake

@@ -0,0 +1,30 @@
+
+include(CMakePackageConfigHelpers)
+include(${CPM_PATH}/testing.cmake)
+
+set(TEST_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/modules)
+
+function(initProjectWithDependency TEST_DEPENDENCY_NAME)
+  configure_package_config_file(
+    "${CMAKE_CURRENT_LIST_DIR}/test_project/ModuleCMakeLists.txt.in"
+    "${CMAKE_CURRENT_LIST_DIR}/test_project/CMakeLists.txt"
+    INSTALL_DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/junk
+  )
+
+  execute_process(
+    COMMAND 
+    ${CMAKE_COMMAND} "-H${CMAKE_CURRENT_LIST_DIR}/test_project" "-B${TEST_BUILD_DIR}"
+    RESULT_VARIABLE ret
+  )
+
+  ASSERT_EQUAL(${ret} "0")
+endfunction()
+
+initProjectWithDependency(A)
+ASSERT_EXISTS(${TEST_BUILD_DIR}/CPM_modules)
+ASSERT_EXISTS(${TEST_BUILD_DIR}/CPM_modules/FindA.cmake)
+ASSERT_NOT_EXISTS(${TEST_BUILD_DIR}/CPM_modules/FindB.cmake)
+
+initProjectWithDependency(B)
+ASSERT_NOT_EXISTS(${TEST_BUILD_DIR}/CPM_modules/FindA.cmake)
+ASSERT_EXISTS(${TEST_BUILD_DIR}/CPM_modules/FindB.cmake)

test/unit/package-lock.cmake

@@ -0,0 +1,49 @@
+
+include(CMakePackageConfigHelpers)
+include(${CPM_PATH}/testing.cmake)
+
+set(TEST_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/package-lock)
+
+function(configureWithDeclare DECLARE_DEPENDENCY)
+  execute_process(COMMAND ${CMAKE_COMMAND} -E rm -rf ${TEST_BUILD_DIR})
+
+  if (DECLARE_DEPENDENCY)
+    set(PREPARE_CODE "CPMDeclarePackage(Dependency
+      NAME Dependency 
+      SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/test_project/dependency
+    )")
+  else()
+    set(PREPARE_CODE "")
+  endif()
+
+  configure_package_config_file(
+    "${CMAKE_CURRENT_LIST_DIR}/test_project/PackageLockCMakeLists.txt.in"
+    "${CMAKE_CURRENT_LIST_DIR}/test_project/CMakeLists.txt"
+    INSTALL_DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/junk
+  )
+
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -H${CMAKE_CURRENT_LIST_DIR}/test_project -B${TEST_BUILD_DIR} -DCPM_INCLUDE_ALL_IN_PACKAGE_LOCK=1
+    RESULT_VARIABLE ret
+  )
+
+  ASSERT_EQUAL(${ret} "0")
+endfunction()
+
+function(updatePackageLock)
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} --build ${TEST_BUILD_DIR} --target cpm-update-package-lock
+    RESULT_VARIABLE ret
+  )
+
+  ASSERT_EQUAL(${ret} "0")
+endfunction()
+
+execute_process(COMMAND ${CMAKE_COMMAND} -E rm -f ${CMAKE_CURRENT_LIST_DIR}/test_project/package-lock.cmake)
+configureWithDeclare(YES)
+ASSERT_NOT_EXISTS(${CMAKE_CURRENT_LIST_DIR}/test_project/package-lock.cmake)
+updatePackageLock()
+ASSERT_EXISTS(${CMAKE_CURRENT_LIST_DIR}/test_project/package-lock.cmake)
+configureWithDeclare(NO)
+execute_process(COMMAND ${CMAKE_COMMAND} -E rm -f ${CMAKE_CURRENT_LIST_DIR}/test_project/package-lock.cmake)
+

test/unit/package-override.cmake

@@ -0,0 +1,20 @@
+
+include(CMakePackageConfigHelpers)
+include(${CPM_PATH}/testing.cmake)
+
+set(TEST_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/project-override)
+
+execute_process(COMMAND ${CMAKE_COMMAND} -E rm -rf ${TEST_BUILD_DIR})
+
+configure_package_config_file(
+  "${CMAKE_CURRENT_LIST_DIR}/test_project/OverrideCMakeLists.txt.in"
+  "${CMAKE_CURRENT_LIST_DIR}/test_project/CMakeLists.txt"
+  INSTALL_DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/junk
+)
+
+execute_process(
+  COMMAND ${CMAKE_COMMAND} -H${CMAKE_CURRENT_LIST_DIR}/test_project -B${TEST_BUILD_DIR} -DCPM_Dependency_SOURCE=${CMAKE_CURRENT_LIST_DIR}/test_project/dependency
+  RESULT_VARIABLE ret
+)
+
+ASSERT_EQUAL(${ret} "0")

test/unit/source_dir.cmake

@@ -0,0 +1,21 @@
+
+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}/test_project/ModuleCMakeLists.txt.in"
+  "${CMAKE_CURRENT_LIST_DIR}/test_project/CMakeLists.txt"
+  INSTALL_DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/junk
+)
+
+execute_process(
+  COMMAND 
+  ${CMAKE_COMMAND} "-H${CMAKE_CURRENT_LIST_DIR}/test_project" "-B${TEST_BUILD_DIR}"
+  RESULT_VARIABLE ret
+)
+
+ASSERT_EQUAL(${ret} "0")

test/unit/test_project/.gitignore

@@ -0,0 +1,2 @@
+/CMakeLists.txt
+/package-lock.cmake

test/unit/test_project/ModuleCMakeLists.txt.in

@@ -0,0 +1,26 @@
+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 @TEST_DEPENDENCY_NAME@
+  SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependency
+)
+
+# ---- check if generated modules override find_package ----
+
+if (@test_check_find_package@)
+  find_package(@TEST_DEPENDENCY_NAME@ REQUIRED)
+endif()
+
+# ---- Call dependency method to validate correct addition of directory ----
+
+dependency_function()

test/unit/test_project/OverrideCMakeLists.txt.in

@@ -0,0 +1,19 @@
+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
+)
+
+# ---- Call dependency method to validate correct addition of directory ----
+
+dependency_function()

test/unit/test_project/PackageLockCMakeLists.txt.in

@@ -0,0 +1,20 @@
+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)
+CPMUsePackageLock(package-lock.cmake)
+
+@PREPARE_CODE@
+
+CPMGetPackage(Dependency)
+
+# ---- Call dependency method to validate correct addition of directory ----
+
+dependency_function()

test/unit/test_project/dependency/CMakeLists.txt

@@ -0,0 +1,4 @@
+
+function(dependency_function)
+  message("called external method")
+endfunction()