default to "ON" for options without explicit value definition (#96)

* default to "ON" for options without explicit value definition

* increment CPM version

* compare the correct lengths

.github/workflows/macos.yml

@@ -0,0 +1,16 @@
+name: MacOS
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: macOS-10.14
+    
+    steps:
+    - uses: actions/checkout@v1
+    
+    - name: run tests
+      run: |
+        cmake -Htest -Bbuild/test
+        cmake --build build/test --target test-verbose

.github/workflows/ubuntu.yml

@@ -0,0 +1,23 @@
+name: Ubuntu
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-18.04
+    
+    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,16 @@
+name: Windows
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: windows-2019
+    
+    steps:
+    - uses: actions/checkout@v1
+    
+    - name: run tests
+      run: |
+        cmake -Htest -Bbuild/test
+        cmake --build build/test --target test-verbose

.gitignore

@@ -1,11 +1,3 @@
-CMakeCache.txt
-CMakeFiles
-CMakeScripts
-Testing
-Makefile
-cmake_install.cmake
-install_manifest.txt
-compile_commands.json
-CTestTestfile.cmake
-build
-.vscode
+/build*
+/.vscode
+*.DS_Store

.travis.yml

@@ -1,4 +1,3 @@
-
 language: cpp
 sudo: require
 dist: xenial
@@ -17,7 +16,7 @@ matrix:
       addons: &gcc8
         apt:
           sources: *all_sources
-          packages: 
+          packages:
             - g++-8
       env:
         - MATRIX_EVAL="export CC=gcc-8; export CXX=g++-8;"
@@ -25,11 +24,11 @@ matrix:
     - os: linux
       compiler: clang
       addons:
-          apt:
-              sources: *all_sources
-              packages:
-                - g++-8
-                - clang-6.0
+        apt:
+          sources: *all_sources
+          packages:
+            - g++-8
+            - clang-6.0
       env:
         - MATRIX_EVAL="export CC=clang-6.0; export CXX=clang++-6.0;"
 
@@ -38,7 +37,7 @@ before_install:
   - eval "${MATRIX_EVAL}"
   - echo "CC=$CC CXX=$CXX"
   # 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 
+  - 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
@@ -46,7 +45,6 @@ before_install:
 script:
   # unit tests
   - cmake -Htest -Bbuild/test
-  - CTEST_OUTPUT_ON_FAILURE=1 cmake --build build/test --target test
-  # examples
-  - python3 examples/run_all.py
- 
+  - 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,44 @@
 
 # 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 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 paramters.
+`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.
+`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
 
@@ -50,24 +57,22 @@ cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 project(MyProject)
 
 # add executable
-add_executable(myProject myProject.cpp)
-set_target_properties(myProject PROPERTIES CXX_STANDARD 17)
+add_executable(tests tests.cpp)
 
 # add dependencies
 include(cmake/CPM.cmake)
 
 CPMAddPackage(
-  NAME LarsParser
-  VERSION 1.8
-  GIT_REPOSITORY https://github.com/TheLartians/Parser.git
-  OPTIONS
-    "LARS_PARSER_BUILD_GLUE_EXTENSION ON"
+  NAME Catch2
+  GITHUB_REPOSITORY catchorg/Catch2
+  VERSION 2.5.0
 )
 
-target_link_libraries(myProject LarsParser)
+# link dependencies
+target_link_libraries(tests Catch2)
 ```
 
-See the [examples directory](https://github.com/TheLartians/CPM/tree/master/examples) for more examples with source code.
+See the [examples directory](https://github.com/TheLartians/CPM/tree/master/examples) for complete examples with source code or the [wiki](https://github.com/TheLartians/CPM/wiki/More-Snippets) for example snippets.
 
 ## Adding CPM
 
@@ -75,40 +80,66 @@ 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://raw.githubusercontent.com/TheLartians/CPM.cmake/master/cmake/CPM.cmake
 ```
 
+You can also use CMake to download CPM for you. See the [wiki](https://github.com/TheLartians/CPM/wiki/Adding-CPM) for more details.
+
 ## Updating CPM
 
-To update CPM to the newest version, simply update the script in the project's cmake 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-Plattform** 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.
+- **Reproducable 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.
-- **Simple source distribution** CPM makes including projects with source files and dependencies easy, reducing the need for monolithic header files.
+- **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 project, all dependencies must be downloaded and built from scratch. A possible workaround is to use CPM to fetch a pre-built binary or to enable local packages (see below).
-- **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 below).
-- **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 [ccahe](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/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 a warning. This can be resolved by adding a new version of the dependency in the outermost project.
 
-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 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.
 
-## Local packages
+## 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>`.
+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.
 
-## Snipplets
+## 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.
 
 ### [Catch2](https://github.com/catchorg/Catch2)
 
@@ -120,13 +151,43 @@ CPMAddPackage(
 )
 ```
 
-### [Doctest](https://github.com/onqtam/doctest)
+### [Boost (via boost-cmake)](https://github.com/Orphis/boost-cmake)
+
+```CMake
+CPMAddPackage(
+  NAME boost-cmake
+  GITHUB_REPOSITORY Orphis/boost-cmake
+  VERSION 1.67.0
+)
+```
+
+### [cxxopts](https://github.com/jarro2783/cxxopts)
 
 ```cmake
 CPMAddPackage(
-  NAME doctest
-  GITHUB_REPOSITORY onqtam/doctest
-  GIT_TAG 2.3.2
+  NAME cxxopts
+  GITHUB_REPOSITORY jarro2783/cxxopts
+  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"
 )
 ```
 
@@ -181,36 +242,18 @@ if(range-v3_ADDED)
 endif()
 ```
 
-### [Yaml-cpp](https://github.com/jbeder/yaml-cpp)
-
-```CMake
-CPMAddPackage(
-  NAME yaml-cpp
-  GITHUB_REPOSITORY jbeder/yaml-cpp
-  # 0.6.2 uses depricated 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"
-)
-```
-
 ### [Lua](https://www.lua.org)
 
 ```cmake
 CPMAddPackage(
   NAME lua
   GIT_REPOSITORY https://github.com/lua/lua.git
-  GIT_TAG v5-3-4
-  VERSION 5.3.4
+  VERSION 5.3.5
   DOWNLOAD_ONLY YES
 )
 
 if (lua_ADDED)
-  # lua has no CMakeLists, so we create our own target
+  # lua has no CMake support, so we create our own target
 
   FILE(GLOB lua_sources ${lua_SOURCE_DIR}/*.c)
   add_library(lua STATIC ${lua_sources})
@@ -224,6 +267,6 @@ endif()
 
 For a full example on using CPM to download and configure lua with sol2 see [here](examples/sol2).
 
-### Examples
+### Full Examples
 
-See the [examples directory](https://github.com/TheLartians/CPM/tree/master/examples) for more examples with source code.
+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.

cmake/CPM.cmake

@@ -28,25 +28,37 @@
 
 cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
-set(CURRENT_CPM_VERSION 0.12) 
+set(CURRENT_CPM_VERSION 0.16)
 
 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})  
+      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()
 endif()
 
+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})
+
 set(CPM_VERSION ${CURRENT_CPM_VERSION} CACHE INTERNAL "")
 set(CPM_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} 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()
+  set(CPM_SOURCE_CACHE_DEFAULT OFF)
+endif()
 
+set(CPM_SOURCE_CACHE ${CPM_SOURCE_CACHE_DEFAULT} CACHE PATH "Directory to downlaod CPM dependencies")
 
 include(FetchContent)
 include(CMakeParseArguments)
@@ -56,7 +68,44 @@ 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})
+  if(${CPM_ARGS_NAME}_FOUND)
+    message(STATUS "${CPM_INDENT} using local package ${CPM_ARGS_NAME}@${${CPM_ARGS_NAME}_VERSION}")
+    CPMRegisterPackage(${CPM_ARGS_NAME} "${${CPM_ARGS_NAME}_VERSION}")
+    set(CPM_PACKAGE_FOUND YES PARENT_SCOPE)
+  else()
+    set(CPM_PACKAGE_FOUND NO PARENT_SCOPE)
+  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 (CPM_DOWNLOAD_ALL)
+    CPMAddPackage(${ARGN})
+    cpm_export_variables()
+    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()
+  endif()
+
+endfunction()
+
+# Download and add a package from source
 function(CPMAddPackage)
 
   set(oneValueArgs
@@ -66,7 +115,9 @@ function(CPMAddPackage)
     DOWNLOAD_ONLY
     GITHUB_REPOSITORY
     GITLAB_REPOSITORY
-    DRY # for testing
+    SOURCE_DIR
+    DOWNLOAD_COMMAND
+    FIND_PACKAGE_ARGUMENTS
   )
 
   set(multiValueArgs
@@ -75,26 +126,21 @@ function(CPMAddPackage)
 
   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_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})
-      message(STATUS "CPM: adding local package ${CPM_ARGS_NAME}@${CPM_ARGS_VERSION}")
-      set_target_properties(${CPM_ARGS_NAME} 
-        PROPERTIES
-          IMPORTED_GLOBAL True
-      )
+    if(CPM_PACKAGE_FOUND)
       return()
     endif()
 
-    if(${CPM_LOCAL_PACKAGES_ONLY}) 
+    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()
 
   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)
+      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)
@@ -122,23 +168,24 @@ function(CPMAddPackage)
   endif()
 
   if (${CPM_ARGS_NAME} IN_LIST CPM_PACKAGES)
-    CPM_GET_PACKAGE_VERSION(${CPM_ARGS_NAME} CPM_PACKAGE_VERSION)
+    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})
+        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)  
+    cpm_fetch_package(${CPM_ARGS_NAME} ${DOWNLOAD_ONLY})
+    cpm_get_fetch_properties(${CPM_ARGS_NAME})
+    SET(${CPM_ARGS_NAME}_SOURCE_DIR "${${CPM_ARGS_NAME}_SOURCE_DIR}")
+    SET(${CPM_ARGS_NAME}_BINARY_DIR "${${CPM_ARGS_NAME}_BINARY_DIR}")  
+    SET(${CPM_ARGS_NAME}_ADDED NO)
+    cpm_export_variables()
     return()
   endif()
 
@@ -146,21 +193,70 @@ function(CPMAddPackage)
 
   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()
 
-  CPM_DECLARE_PACKAGE(${CPM_ARGS_NAME} ${CPM_ARGS_VERSION} ${CPM_ARGS_GIT_TAG} "${CPM_ARGS_UNPARSED_ARGUMENTS}")
-  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)  
+  set(FETCH_CONTENT_DECLARE_EXTRA_OPTS "")
+
+  if (DEFINED CPM_ARGS_GIT_TAG)
+    set(PACKAGE_INFO "${CPM_ARGS_GIT_TAG}")
+  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()
+    endif()
+  endif()
+
+  cpm_declare_fetch(${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})
+  cpm_get_fetch_properties(${CPM_ARGS_NAME})
+  SET(${CPM_ARGS_NAME}_ADDED YES)
+  cpm_export_variables()
 endfunction()
 
-function (CPM_DECLARE_PACKAGE PACKAGE VERSION GIT_TAG)
-  message(STATUS "${CPM_INDENT} adding package ${PACKAGE}@${VERSION} (${GIT_TAG})")
+# export variables available to the caller to the parent scope
+# expects ${CPM_ARGS_NAME} to be set
+macro(cpm_export_variables)
+  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 "${${CPM_ARGS_NAME}_ADDED}" PARENT_SCOPE)
+endmacro()
+
+# declares that a package 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}) 
     message(STATUS "${CPM_INDENT} package not declared (dry run)")
@@ -173,7 +269,19 @@ function (CPM_DECLARE_PACKAGE PACKAGE VERSION GIT_TAG)
   )
 endfunction()
 
-function (CPM_FETCH_PACKAGE PACKAGE DOWNLOAD_ONLY)  
+# returns properties for a package previously defined by cpm_declare_fetch
+function (cpm_get_fetch_properties PACKAGE)
+  if (${CPM_DRY_RUN}) 
+    return()
+  endif()
+  FetchContent_GetProperties(${PACKAGE})
+  string(TOLOWER ${PACKAGE} lpackage)
+  SET(${PACKAGE}_SOURCE_DIR "${${lpackage}_SOURCE_DIR}" PARENT_SCOPE)
+  SET(${PACKAGE}_BINARY_DIR "${${lpackage}_BINARY_DIR}" PARENT_SCOPE)
+endfunction()
+
+# 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)")
@@ -192,46 +300,30 @@ function (CPM_FETCH_PACKAGE PACKAGE DOWNLOAD_ONLY)
   set(CPM_INDENT "${CPM_OLD_INDENT}")
 endfunction()
 
-function (CPMGetProperties PACKAGE)
-  if (${CPM_DRY_RUN}) 
-    return()
-  endif()
-  FetchContent_GetProperties(${PACKAGE})
-  string(TOLOWER ${PACKAGE} lpackage)
-  SET(${PACKAGE}_SOURCE_DIR "${${lpackage}_SOURCE_DIR}" PARENT_SCOPE)
-  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 "")
-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

@@ -4,7 +4,19 @@ function(ASSERT_EQUAL)
     message(FATAL_ERROR "assertion failed: invalid argument count: ${ARGC}")
   endif()
 
-  if (NOT ${ARGV0} EQUAL ${ARGV1})
+  if (NOT ${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}'")
+  endif()
+endfunction()
+
+function(ASSERTION_FAILED)
+  message(FATAL_ERROR "assertion failed: ${ARGN}")
+endfunction()

examples/benchmark/CMakeLists.txt

@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
+project(CPMExampleBenchmark)
+
 # ---- Dependencies ----
 
 include(../../cmake/CPM.cmake)
@@ -7,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

@@ -0,0 +1,21 @@
+cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
+
+project(CPMExampleBoost)
+
+# ---- Create binary ----
+
+add_executable(CPMExampleBoost main.cpp)
+set_target_properties(CPMExampleBoost PROPERTIES CXX_STANDARD 17)
+
+# ---- Dependencies ----
+
+include(../../cmake/CPM.cmake)
+
+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/boost/main.cpp

@@ -0,0 +1,30 @@
+//
+// timer.cpp
+// ~~~~~~~~~
+//
+// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#include <iostream>
+#include <boost/asio.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
+
+void print(const boost::system::error_code& /*e*/)
+{
+  std::cout << "Hello, world!" << std::endl;
+}
+
+int main()
+{
+  boost::asio::io_service io;
+
+  boost::asio::deadline_timer t(io, boost::posix_time::seconds(1));
+  t.async_wait(&print);
+
+  io.run();
+
+  return 0;
+}

examples/build_all.py

@@ -22,7 +22,7 @@ for example in examples:
   print("running example %s" % example.name)
   print("================" + ('=' * len(example.name)))
   project = Path(".") / 'build' / example.name
-  configure = runCommand('cmake -H%s -B%s -DCMAKE_BUILD_TYPE=RelWithDebInfo' % (example, project))
+  configure = runCommand('cmake -H%s -B%s' % (example, project))
   print('  ' + '\n  '.join([line for line in configure.split('\n') if 'CPM:' in line]))
   build = runCommand('cmake --build %s -j4' % (project))
   print('  ' + '\n  '.join([line for line in build.split('\n') if 'Built target' in line]))

examples/catch2/CMakeLists.txt

@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
+project(CPMExampleCatch2)
+
 # ---- Options ----
 
 option(ENABLE_TEST_COVERAGE "Enable test coverage" OFF)
@@ -11,7 +13,7 @@ include(../../cmake/CPM.cmake)
 CPMAddPackage(
   NAME fibonacci
   GIT_REPOSITORY https://github.com/TheLartians/Fibonacci.git
-  VERSION 1.0
+  VERSION 2.0
 )
 
 CPMAddPackage(

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/cereal/CMakeLists.txt

@@ -0,0 +1,22 @@
+cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
+
+project(CPMExampleCereal)
+
+# ---- Dependencies ----
+
+include(../../cmake/CPM.cmake)
+
+CPMAddPackage(
+  NAME cereal
+  VERSION 1.2.2
+  GITHUB_REPOSITORY USCiLab/cereal
+  OPTIONS
+    "SKIP_PORTABILITY_TEST ON"
+    "JUST_INSTALL_CEREAL ON"
+)
+
+# ---- Create binary ----
+
+add_executable(CPMExampleCereal main.cpp)
+target_link_libraries(CPMExampleCereal cereal )
+set_target_properties(CPMExampleCereal PROPERTIES CXX_STANDARD 17)

examples/cereal/main.cpp

@@ -0,0 +1,34 @@
+#define CATCH_CONFIG_MAIN
+
+#include <cereal/cereal.hpp>
+#include <cereal/archives/json.hpp>
+
+#include <string>
+#include <sstream>
+
+struct player_data 
+{
+  int id{-1};
+  std::string name{};
+};
+
+template<typename Archive>
+void serialize(Archive& archive, player_data const &data)
+{
+  archive(
+    cereal::make_nvp("id", data.id), 
+    cereal::make_nvp("name", data.name)
+  );
+}
+
+int main(int argc, char const *argv[])
+{
+  player_data player{3, "Gamer One"};
+  std::ostringstream oss;
+  cereal::JSONOutputArchive output(oss);
+  output(cereal::make_nvp("player_data", player));
+
+  std::cout << oss.str() << std::endl;
+
+  return 0;
+}

examples/cxxopts/CMakeLists.txt

@@ -0,0 +1,26 @@
+cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
+
+project(CPMExampleCXXOpts)
+
+# ---- Options ----
+
+option(ENABLE_TEST_COVERAGE "Enable test coverage" OFF)
+
+# ---- Dependencies ----
+
+include(../../cmake/CPM.cmake)
+
+CPMAddPackage(
+  NAME cxxopts
+  GITHUB_REPOSITORY jarro2783/cxxopts
+  VERSION 2.2.0
+  OPTIONS
+    "CXXOPTS_BUILD_EXAMPLES Off"
+    "CXXOPTS_BUILD_TESTS Off"
+)
+
+# ---- Create binary ----
+
+add_executable(CPMExampleCXXOpts main.cpp)
+target_link_libraries(CPMExampleCXXOpts cxxopts)
+set_target_properties(CPMExampleCXXOpts PROPERTIES CXX_STANDARD 17 COMPILE_FLAGS "-Wall -pedantic -Wextra -Werror")

examples/cxxopts/main.cpp

@@ -0,0 +1,23 @@
+#include <cxxopts.hpp>
+#include <iostream>
+
+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>());
+
+  auto result = options.parse(argc, argv);
+  
+  if (result["help"].as<bool>()) {
+    std::cout << options.help() << std::endl;
+    return 0;
+  }
+
+  for (auto arg: result.arguments()) {
+    std::cout << "option: " << arg.key() << ": " << arg.value() << std::endl;
+  }
+
+  return 0;
+}

examples/doctest/CMakeLists.txt

@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
+project(CPMExampleDoctest)
+
 # ---- Options ----
 
 option(ENABLE_TEST_COVERAGE "Enable test coverage" OFF)
@@ -11,7 +13,7 @@ include(../../cmake/CPM.cmake)
 CPMAddPackage(
   NAME fibonacci
   GIT_REPOSITORY https://github.com/TheLartians/Fibonacci.git
-  VERSION 1.0
+  VERSION 2.0
 )
 
 CPMAddPackage(

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/entt/CMakeLists.txt

@@ -0,0 +1,26 @@
+cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
+
+project(CPMEnTTExample)
+
+# ---- Dependencies ----
+
+include(../../cmake/CPM.cmake)
+
+CPMAddPackage(
+  NAME EnTT
+  VERSION 3.1.1
+  GITHUB_REPOSITORY skypjack/entt
+  # EnTT's CMakeLists screws with configuration options
+  DOWNLOAD_ONLY True
+)
+
+if (EnTT_ADDED)
+  add_library(EnTT INTERFACE)
+  target_include_directories(EnTT INTERFACE ${EnTT_SOURCE_DIR}/src)
+endif()
+
+# ---- Executable ----
+
+add_executable(CPMEnTTExample "main.cpp")
+set_target_properties(CPMEnTTExample PROPERTIES CXX_STANDARD 17)        
+target_link_libraries(CPMEnTTExample EnTT)

examples/entt/main.cpp

@@ -0,0 +1,54 @@
+#include <entt/entt.hpp>
+#include <cstdint>
+
+struct position {
+    float x;
+    float y;
+};
+
+struct velocity {
+    float dx;
+    float dy;
+};
+
+void update(entt::registry &registry) {
+    auto view = registry.view<position, velocity>();
+
+    for(auto entity: view) {
+        // gets only the components that are going to be used ...
+
+        auto &vel = view.get<velocity>(entity);
+
+        vel.dx = 0.;
+        vel.dy = 0.;
+
+        // ...
+    }
+}
+
+void update(std::uint64_t dt, entt::registry &registry) {
+    registry.view<position, velocity>().each([dt](auto &pos, auto &vel) {
+        // gets all the components of the view at once ...
+
+        pos.x += vel.dx * dt;
+        pos.y += vel.dy * dt;
+
+        // ...
+    });
+}
+
+int main() {
+    entt::registry registry;
+    std::uint64_t dt = 16;
+
+    for(auto i = 0; i < 10; ++i) {
+        auto entity = registry.create();
+        registry.assign<position>(entity, i * 1.f, i * 1.f);
+        if(i % 2 == 0) { registry.assign<velocity>(entity, i * .1f, i * .1f); }
+    }
+
+    update(dt, registry);
+    update(registry);
+
+    // ...
+}

examples/gtest/CMakeLists.txt

@@ -0,0 +1,45 @@
+cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
+
+project(CPMExampleGtest)
+
+# ---- Options ----
+
+option(ENABLE_TEST_COVERAGE "Enable test coverage" OFF)
+
+# ---- Dependencies ----
+
+include(../../cmake/CPM.cmake)
+
+CPMAddPackage(
+  NAME fibonacci
+  GIT_REPOSITORY https://github.com/TheLartians/Fibonacci.git
+  VERSION 2.0
+)
+
+CPMAddPackage(
+  NAME googletest
+  GITHUB_REPOSITORY google/googletest
+  GIT_TAG release-1.8.1
+  VERSION 1.8.1
+  OPTIONS
+      "INSTALL_GTEST OFF"
+      "gtest_force_shared_crt"
+)
+
+# ---- Create binary ----
+
+add_executable(CPMExampleGtest main.cpp)
+target_link_libraries(CPMExampleGtest fibonacci gtest gtest_main gmock)
+set_target_properties(CPMExampleGtest PROPERTIES CXX_STANDARD 17)
+
+# ---- Enable testing ----
+
+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

@@ -0,0 +1,13 @@
+#include <gtest/gtest.h>
+#include <fibonacci.h>
+
+TEST(FibonacciTests, BasicChecks)
+{
+  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/json/CMakeLists.txt

@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
+project(CPMJSONExample)
+
 # ---- Dependencies ----
 
 include(../../cmake/CPM.cmake)

examples/linenoise/CMakeLists.txt

@@ -0,0 +1,24 @@
+cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
+
+project(CPMlinenoiseExample)
+
+# ---- Dependencies ----
+
+include(../../cmake/CPM.cmake)
+
+CPMAddPackage(
+  NAME linenoise
+  GIT_TAG 1.0
+  GITHUB_REPOSITORY antirez/linenoise
+)
+
+if(linenoise_ADDED)
+  add_library(linenoise ${linenoise_SOURCE_DIR}/linenoise.c)
+  target_include_directories(linenoise PUBLIC ${linenoise_SOURCE_DIR})
+endif()
+
+# ---- Executable ----
+
+add_executable(CPMlinenoiseExample "main.cpp")
+set_target_properties(CPMlinenoiseExample PROPERTIES CXX_STANDARD 17)        
+target_link_libraries(CPMlinenoiseExample linenoise)

examples/linenoise/main.cpp

@@ -0,0 +1,64 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "linenoise.h"
+
+
+void completion(const char *buf, linenoiseCompletions *lc) {
+    if (buf[0] == 'h') {
+        linenoiseAddCompletion(lc,"hello");
+        linenoiseAddCompletion(lc,"hello there");
+    }
+}
+
+int main(int argc, char **argv) {
+    char *line;
+    char *prgname = argv[0];
+
+    /* Parse options, with --multiline we enable multi line editing. */
+    while(argc > 1) {
+        argc--;
+        argv++;
+        if (!strcmp(*argv,"--multiline")) {
+            linenoiseSetMultiLine(1);
+            printf("Multi-line mode enabled.\n");
+        } else if (!strcmp(*argv,"--keycodes")) {
+            linenoisePrintKeyCodes();
+            exit(0);
+        } else {
+            fprintf(stderr, "Usage: %s [--multiline] [--keycodes]\n", prgname);
+            exit(1);
+        }
+    }
+
+    /* Set the completion callback. This will be called every time the
+     * user uses the <tab> key. */
+    linenoiseSetCompletionCallback(completion);
+
+    /* Load history from file. The history file is just a plain text file
+     * where entries are separated by newlines. */
+    linenoiseHistoryLoad("history.txt"); /* Load the history at startup */
+
+    /* Now this is the main loop of the typical linenoise-based application.
+     * The call to linenoise() will block as long as the user types something
+     * and presses enter.
+     *
+     * The typed string is returned as a malloc() allocated string by
+     * linenoise, so the user needs to free() it. */
+    while((line = linenoise("hello> ")) != NULL) {
+        /* Do something with the string. */
+        if (line[0] != '\0' && line[0] != '/') {
+            printf("echo: '%s'\n", line);
+            linenoiseHistoryAdd(line); /* Add to the history. */
+            linenoiseHistorySave("history.txt"); /* Save the history on disk. */
+        } else if (!strncmp(line,"/historylen",11)) {
+            /* The "/historylen" command will change the history len. */
+            int len = atoi(line+11);
+            linenoiseHistorySetMaxLen(len);
+        } else if (line[0] == '/') {
+            printf("Unreconized command: %s\n", line);
+        }
+        free(line);
+    }
+    return 0;
+}

examples/parser-lua/CMakeLists.txt

@@ -1,28 +0,0 @@
-cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
-
-include(../../cmake/CPM.cmake)
-
-# ---- Dependencies ----
-
-CPMAddPackage(
-  NAME Glue
-  GIT_REPOSITORY https://github.com/TheLartians/Glue.git
-  VERSION 0.8.1
-  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,15 +0,0 @@
-cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
-
-# 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;
-}

examples/range-v3/CMakeLists.txt

@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
+project(CPMRangev3Example)
+
 # ---- Dependencies ----
 
 include(../../cmake/CPM.cmake)

examples/simple_match/CMakeLists.txt

@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
+project(CPMSimpleMatchExample)
+
 # ---- Dependencies ----
 
 include(../../cmake/CPM.cmake)

examples/sol2/CMakeLists.txt

@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
+project(CPMSol2Example)
+
 # ---- Dependencies ----
 
 include(../../cmake/CPM.cmake)
@@ -7,8 +9,7 @@ include(../../cmake/CPM.cmake)
 CPMAddPackage(
   NAME lua
   GIT_REPOSITORY https://github.com/lua/lua.git
-  VERSION 5.3.4
-  GIT_TAG v5-3-4
+  VERSION 5.3.5
   DOWNLOAD_ONLY YES
 )
 

examples/yaml/CMakeLists.txt

@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
+project(CPMYamlExample)
+
 # ---- Dependencies ----
 
 include(../../cmake/CPM.cmake)
@@ -7,7 +9,7 @@ include(../../cmake/CPM.cmake)
 CPMAddPackage(
   NAME yaml-cpp
   GIT_REPOSITORY https://github.com/jbeder/yaml-cpp.git
-  # 0.6.2 uses depricated CMake syntax
+  # 0.6.2 uses deprecated CMake syntax
   VERSION 0.6.3                                  
   # 0.6.3 is not released yet, so use the most recent commit
   GIT_TAG 012269756149ae99745b6dafefd415843d7420bb 

test/CMakeLists.txt

@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
+project(CPMTests)
+
 file(GLOB tests "${CMAKE_CURRENT_SOURCE_DIR}/unit/*.cmake")
 
 enable_testing()
@@ -10,5 +12,6 @@ foreach(test ${tests})
     NAME ${test} 
     COMMAND ${CMAKE_COMMAND} -DCPM_PATH=${CMAKE_CURRENT_SOURCE_DIR}/../cmake -P "${test}"
   )
-
 endforeach()
+
+add_custom_target(test-verbose COMMAND ${CMAKE_CTEST_COMMAND} -C Debug --verbose)

test/unit/cache.cmake

@@ -0,0 +1,121 @@
+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)
+  FILE(REMOVE_RECURSE ${CPM_SOURCE_CACHE_DIR})
+  
+  if (EXISTS "${CPM_SOURCE_CACHE_DIR}")
+    ASSERTION_FAILED("cache not cleared")
+  endif()
+endfunction()
+
+function(update_cmake_lists)
+  configure_package_config_file(
+    "${CMAKE_CURRENT_LIST_DIR}/cache/CMakeLists.txt.in"
+    "${CMAKE_CURRENT_LIST_DIR}/cache/CMakeLists.txt"
+    INSTALL_DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/junk
+  )
+endfunction()
+
+function(reset_test)
+  clear_cache()
+  FILE(REMOVE_RECURSE ${TEST_BUILD_DIR})
+  update_cmake_lists()
+endfunction()
+
+set(FIBONACCI_VERSION 1.0)
+
+## Read CPM_SOURCE_CACHE from arguments
+
+reset_test()
+
+execute_process(
+  COMMAND 
+  ${CMAKE_COMMAND} "-H${CMAKE_CURRENT_LIST_DIR}/cache" "-B${TEST_BUILD_DIR}" "-DCPM_SOURCE_CACHE=${CPM_SOURCE_CACHE_DIR}"
+  RESULT_VARIABLE ret
+)
+
+ASSERT_EQUAL(${ret} "0")
+
+if (NOT EXISTS "${CPM_SOURCE_CACHE_DIR}/fibonacci")
+  ASSERTION_FAILED("fibonacci not in cache")
+endif()
+
+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} "1")
+
+## Update dependency and keep CPM_SOURCE_CACHE
+
+set(FIBONACCI_VERSION 2.0)
+update_cmake_lists()
+
+execute_process(
+  COMMAND 
+  ${CMAKE_COMMAND} ${TEST_BUILD_DIR}
+  RESULT_VARIABLE ret
+)
+
+ASSERT_EQUAL(${ret} "0")
+
+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
+
+clear_cache()
+
+execute_process(
+  COMMAND 
+  ${CMAKE_COMMAND} ${TEST_BUILD_DIR}
+  RESULT_VARIABLE ret
+)
+
+ASSERT_EQUAL(${ret} "0")
+
+if (NOT EXISTS "${CPM_SOURCE_CACHE_DIR}/fibonacci")
+  ASSERTION_FAILED("fibonacci not in cache")
+endif()
+
+## Read CPM_SOURCE_CACHE from environment
+
+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")
+
+if (NOT EXISTS "${CPM_SOURCE_CACHE_DIR}/fibonacci")
+  ASSERTION_FAILED("fibonacci not in cache")
+endif()
+
+## Overwrite CPM_SOURCE_CACHE with argument
+
+reset_test()
+
+execute_process(
+  COMMAND 
+  ${CMAKE_COMMAND} -E env "CPM_SOURCE_CACHE=${CMAKE_CURRENT_BINARY_DIR}/junk" ${CMAKE_COMMAND} "-H${CMAKE_CURRENT_LIST_DIR}/cache" "-B${TEST_BUILD_DIR}" "-DCPM_SOURCE_CACHE=${CPM_SOURCE_CACHE_DIR}"
+  RESULT_VARIABLE ret
+)
+
+ASSERT_EQUAL(${ret} "0")
+
+if (NOT EXISTS "${CPM_SOURCE_CACHE_DIR}/fibonacci")
+  ASSERTION_FAILED("fibonacci not in cache")
+endif()

test/unit/cache/.gitignore

@@ -0,0 +1 @@
+/CMakeLists.txt

test/unit/cache/CMakeLists.txt.in

@@ -0,0 +1,23 @@
+cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
+
+project(CPMExampleCatch2)
+
+# ---- Options ----
+
+option(ENABLE_TEST_COVERAGE "Enable test coverage" OFF)
+
+# ---- Dependencies ----
+
+include(@CPM_PATH@/CPM.cmake)
+
+CPMAddPackage(
+  NAME fibonacci
+  GIT_REPOSITORY https://github.com/TheLartians/Fibonacci.git
+  VERSION @FIBONACCI_VERSION@
+)
+
+# ---- Create binary ----
+
+add_executable(CPMExampleCatch2 main.cpp)
+target_link_libraries(CPMExampleCatch2 fibonacci)
+set_target_properties(CPMExampleCatch2 PROPERTIES CXX_STANDARD 17 COMPILE_FLAGS "-Wall -pedantic -Wextra -Werror")

test/unit/cache/main.cpp

@@ -0,0 +1,9 @@
+#define CATCH_CONFIG_MAIN
+
+#include <fibonacci.h>
+#include <iostream>
+
+int main(){
+  std::cout << "fib(10) = " << fastFibonacci(10) << std::endl;
+  return 0;
+}

test/unit/dependency_properties.cmake

@@ -10,21 +10,32 @@ CPMAddPackage(
   GIT_TAG 1.2.3
 )
 
-CPM_GET_PACKAGE_VERSION(A VERSION)
+CPMAddPackage(
+  NAME A
+  VERSION 1.2.3
+)
+
+CPMGetPackageVersion(A VERSION)
 ASSERT_EQUAL(${VERSION} "1.2.3")
 
+CPMAddPackage(
+  NAME B
+  VERSION 2.4.1
+)
+
 CPMAddPackage(
   NAME B
   GIT_TAG v2.3.1
 )
 
-CPM_GET_PACKAGE_VERSION(B VERSION)
-ASSERT_EQUAL(${VERSION} "2.3.1")
+CPMGetPackageVersion(B VERSION)
+ASSERT_EQUAL(${VERSION} "2.4.1")
 
 CPMAddPackage(
   NAME C
   GIT_TAG v3.1.2-a
+  VERSION 3.1.2
 )
 
-CPM_GET_PACKAGE_VERSION(C VERSION)
+CPMGetPackageVersion(C VERSION)
 ASSERT_EQUAL(${VERSION} "3.1.2")