add on-demand download script to release

.clang-format

@@ -1,16 +0,0 @@
----
-  BasedOnStyle: Google
-  AccessModifierOffset: '-2'
-  AlignTrailingComments: 'true'
-  AllowAllParametersOfDeclarationOnNextLine: 'false'
-  AlwaysBreakTemplateDeclarations: 'No'
-  BreakBeforeBraces: Attach
-  ColumnLimit: '100'
-  ConstructorInitializerAllOnOneLineOrOnePerLine: 'true'
-  IncludeBlocks: Regroup
-  IndentPPDirectives: AfterHash
-  IndentWidth: '2'
-  NamespaceIndentation: All
-  BreakBeforeBinaryOperators: All
-  BreakBeforeTernaryOperators: 'true'
-...

.cmake-format

@@ -1,73 +0,0 @@
-format:
-  tab_size: 2
-  line_width: 100
-  dangle_parens: true
-
-parse:
-  additional_commands:
-    cpmaddpackage:
-      pargs:
-        nargs: '*'
-        flags: []
-      spelling: CPMAddPackage
-      kwargs: &cpmaddpackagekwargs
-        NAME: 1
-        FORCE: 1
-        VERSION: 1
-        GIT_TAG: 1
-        DOWNLOAD_ONLY: 1
-        GITHUB_REPOSITORY: 1
-        GITLAB_REPOSITORY: 1
-        GIT_REPOSITORY: 1
-        SVN_REPOSITORY: 1
-        SVN_REVISION: 1
-        SOURCE_DIR: 1
-        DOWNLOAD_COMMAND: 1
-        FIND_PACKAGE_ARGUMENTS: 1
-        NO_CACHE: 1
-        GIT_SHALLOW: 1
-        URL: 1
-        URL_HASH: 1
-        URL_MD5: 1
-        DOWNLOAD_NAME: 1
-        DOWNLOAD_NO_EXTRACT: 1
-        HTTP_USERNAME: 1
-        HTTP_PASSWORD: 1
-        EXCLUDE_FROM_ALL: 1
-        SOURCE_SUBDIR: 1
-        OPTIONS: +
-    cpmfindpackage:
-      pargs:
-        nargs: '*'
-        flags: []
-      spelling: CPMFindPackage
-      kwargs: *cpmaddpackagekwargs
-    cpmdeclarepackage:
-      pargs:
-        nargs: '*'
-        flags: []
-      spelling: CPMDeclarePackage
-      kwargs: *cpmaddpackagekwargs
-    packageproject:
-      pargs:
-        nargs: '*'
-        flags: []
-      spelling: packageProject
-      kwargs:
-        NAME: 1
-        VERSION: 1
-        INCLUDE_DIR: 1
-        INCLUDE_DESTINATION: 1
-        BINARY_DIR: 1
-        COMPATIBILITY: 1
-        VERSION_HEADER: 1
-        DEPENDENCIES: +
-    cpmusepackagelock:
-      pargs: 1
-      spelling: CPMUsePackageLock
-    cpmregisterpackage:
-      pargs: 1
-      spelling: CPMRegisterPackage
-    cpmgetpackageversion:
-      pargs: 2
-      spelling: CPMGetPackageVersion

.github/workflows/examples.yml

@@ -1,30 +0,0 @@
-name: Examples
-
-on:
-  push:
-    branches:
-    - master
-  pull_request:
-    branches:
-    - master
-
-jobs:
-  gcc:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: build all
-        env:
-          CC: gcc
-          CXX: g++
-        run: python3 examples/build_all.py
-
-  clang:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: build all
-        env:
-          CC: clang
-          CXX: clang++
-        run: python3 examples/build_all.py

.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

@@ -15,8 +15,8 @@ jobs:
       - name: Set CPM version by tag
         run: |
           mkdir dist
-          sed "s/1.0.0-development-version/${GITHUB_REF/refs\/tags\/v}/g" cmake/CPM.cmake > dist/CPM.cmake
-          sed "s/1.0.0-development-version/${GITHUB_REF/refs\/tags\/v}/g" cmake/get_cpm.cmake > dist/get_cpm.cmake
+          sed "s/0.27.2-development-version/${GITHUB_REF/refs\/tags\/v}/g" cmake/CPM.cmake > dist/CPM.cmake
+          sed "s/0.27.2-development-version/${GITHUB_REF/refs\/tags\/v}/g" cmake/get_cpm.cmake > dist/get_cpm.cmake
 
       - name: Upload CPM.cmake to release
         uses: svenstaro/upload-release-action@v1-release

.github/workflows/style.yml

@@ -1,28 +0,0 @@
-name: Style
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  style:
-
-    runs-on: macos-latest
-    
-    steps:
-    - uses: actions/checkout@v1
-    
-    - name: Install format dependencies
-      run: |
-        brew install clang-format
-        pip3 install cmake_format==0.6.11 pyyaml
-
-    - name: configure
-      run: cmake -Stest/style -Bbuild/style
-
-    - name: check style
-      run: cmake --build build/style --target check-format

.github/workflows/test.yml

@@ -1,33 +0,0 @@
-name: Test
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  tests:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        # windows-latest is windows-2019 which carries a pretty old version of ruby (2.5)
-        # we need at least ruby 2.7 for the tests
-        # instead of dealing with installing a modern version of ruby on 2019, we'll just use windows-2022 here
-        os: [ubuntu-latest, windows-2022, macos-latest]
-
-    steps:
-      - name: clone
-        uses: actions/checkout@v2
-
-      - name: unit tests
-        run: |
-          cmake -Stest -Bbuild/test
-          cmake --build build/test --target test-verbose
-
-      - name: integration tests
-        run: ruby test/integration/runner.rb
-        env:
-          CPM_INTEGRATION_TEST_DIR: ./build/integration

.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

.gitignore

@@ -1,4 +1,3 @@
-build/
 /build*
 /.vscode
-*.DS_Store
+*.DS_Store

.travis.yml

@@ -0,0 +1,50 @@
+language: cpp
+sudo: require
+dist: xenial
+
+common_sources: &all_sources
+  - ubuntu-toolchain-r-test
+  - llvm-toolchain-trusty
+
+python:
+  - 3.7
+
+matrix:
+  include:
+    - os: linux
+      compiler: gcc
+      addons: &gcc8
+        apt:
+          sources: *all_sources
+          packages:
+            - g++-8
+      env:
+        - MATRIX_EVAL="export CC=gcc-8; export CXX=g++-8;"
+
+    - os: linux
+      compiler: clang
+      addons:
+        apt:
+          sources: *all_sources
+          packages:
+            - g++-8
+            - clang-6.0
+      env:
+        - MATRIX_EVAL="export CC=clang-6.0; export CXX=clang++-6.0;"
+
+before_install:
+  # Update compilers
+  - 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
+  - sudo sh cmake.sh --skip-license --exclude-subdir --prefix=/usr/local
+  - export PATH=/usr/local/bin:$PATH
+  - cmake --version
+
+script:
+  # unit tests
+  - cmake -Htest -Bbuild/test
+  - cmake --build build/test --target test-verbose
+  # build examples
+  - python3 examples/build_all.py

CONTRIBUTORS.md

@@ -1,32 +0,0 @@
-# CPM.cmake Contributors
-
-For detailed breakdown of individual contributions see the [Contributors page on GitHub](https://github.com/cpm-cmake/CPM.cmake/graphs/contributors)
-
-* [Lars Melchior](https://github.com/TheLartians)
-* [Borislav Stanimirov](https://github.com/iboB)
-* [Paul T](https://github.com/DeveloperPaul123)
-* [Leonardo Lima](https://github.com/leozz37)
-* [pgorgon-hem](https://github.com/pgorgon-hem)
-* [Xavier Muller](https://github.com/xmuller)
-* NVIDIA CORPORATION via [Robert Maynard](https://github.com/robertmaynard)
-* [Kingsley Chen](https://github.com/kingsamchen)
-* [alexandreSalconiDenis](https://github.com/alexandreSalconiDenis)
-* [DNKpp](https://github.com/DNKpp)
-* [Olivier Le Doeuff](https://github.com/OlivierLDff)
-* [Stuart Dootson](https://github.com/studoot)
-* [Tobias Hellmann](https://github.com/Tobi823)
-* [Giuseppe Cesarano](https://github.com/GiuseppeCesarano)
-* [Pavel Sokolov](https://github.com/hacker-cb)
-* [Claus Klein](https://github.com/ClausKlein)
-* [Clare Macrae](https://github.com/claremacrae)
-* [Kai Germaschewski](https://github.com/germasch)
-* [Andrea Barbadoro](https://github.com/andijcr)
-* [MixusMinimax](https://github.com/MixusMinimax)
-* [Dan Raviv](https://github.com/danra)
-* [Prabir Shrestha](https://github.com/prabirshrestha)
-* [Paul Taylor](https://github.com/trxcllnt)
-* [Ryan Mast](https://github.com/nightlark)
-* [Vinpasso](https://github.com/Vinpasso)
-* [Yotam Gingold](https://github.com/yig)
-* [jecassis](https://github.com/jecassis)
-* [Johel Ernesto Guerrero Peña](https://github.com/JohelEGP)

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019-2022 Lars Melchior and contributors
+Copyright (c) 2019 Lars Melchior
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,13 +1,15 @@
+[![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)
 
-<br />
 <p align="center">
   <img src="./logo/CPM.png" height="100" />
 </p>
-<br />
 
 # Setup-free CMake dependency management
 
-CPM.cmake is a cross-platform CMake script that adds dependency management capabilities to CMake.
+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, a simple API [and more](#comparison-to-pure-fetchcontent--externalproject).
 
 ## Manage everything
@@ -16,16 +18,11 @@ Any downloadable project or resource can be added as a version-controlled depend
 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).
 
-## Further reading
-
-- [CPM: An Awesome Dependency Manager for C++ with CMake](https://medium.com/swlh/cpm-an-awesome-dependency-manager-for-c-with-cmake-3c53f4376766)
-- [CMake and the Future of C++ Package Management](https://ibob.github.io/blog/2020/01/13/cmake-package-management/)
-
 ## 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(
@@ -39,44 +36,18 @@ CPMAddPackage(
 
 The origin may be specified by a `GIT_REPOSITORY`, but other sources, such as direct URLs, are [also supported](https://cmake.org/cmake/help/v3.11/module/ExternalProject.html#external-project-definition).
 If `GIT_TAG` hasn't been explicitly specified it defaults to `v(VERSION)`, a common convention for git projects.
-On the other hand, if `VERSION` hasn't been explicitly specified, CPM can automatically identify the version from the git tag in some common cases.
-`GIT_TAG` can also be set to a specific commit or a branch name such as `master`, however this isn't recommended, as such packages will only be updated when the cache is cleared.
+On the other hand, if `VERSION` hasn't been explicitly specified, CPM can automatically identify the version from the git tag in some common cases. 
+`GIT_TAG` can also be set to a specific commit or a branch name such as `master` to always download the most recent version.
+The optional argument `FIND_PACKAGE_ARGUMENTS` can be specified to a string of parameters that will be passed to `find_package` if enabled (see below).
 
-If an additional optional parameter `EXCLUDE_FROM_ALL` is set to a truthy value, then any targets defined inside the dependency won't be built by default. See the [CMake docs](https://cmake.org/cmake/help/latest/prop_tgt/EXCLUDE_FROM_ALL.html) for details.
-
-A single-argument compact syntax is also supported:
-
-```cmake
-# A git package from a given uri with a version
-CPMAddPackage("uri@version")
-# A git package from a given uri with a git tag or commit hash
-CPMAddPackage("uri#tag")
-# A git package with both version and tag provided
-CPMAddPackage("uri@version#tag")
-```
-
-In the shorthand syntax if the URI is of the form `gh:user/name`, it is interpreted as GitHub URI and converted to `https://github.com/user/name.git`. If the URI is of the form `gl:user/name`, it is interpreted as a [GitLab](https://gitlab.com/explore/) URI and converted to `https://gitlab.com/user/name.git`. If the URI is of the form `bb:user/name`, it is interpreted as a [Bitbucket](https://bitbucket.org/) URI and converted to `https://bitbucket.org/user/name.git`. Otherwise the URI used verbatim as a git URL. All packages added using the shorthand syntax will be added using the [EXCLUDE_FROM_ALL](https://cmake.org/cmake/help/latest/prop_tgt/EXCLUDE_FROM_ALL.html) flag.
-
-The single-argument syntax also works for URLs:
-
-```cmake
-# An archive package from a given url. The version is inferred
-CPMAddPackage("https://example.com/my-package-1.2.3.zip")
-# An archive package from a given url with an MD5 hash provided
-CPMAddPackage("https://example.com/my-package-1.2.3.zip#MD5=68e20f674a48be38d60e129f600faf7d")
-# An archive package from a given url. The version is explicitly given
-CPMAddPackage("https://example.com/my-package.zip@1.2.3")
-```
-
-After calling `CPMAddPackage`, the following variables are defined in the local scope, where `<dependency>` is the name of the dependency.
+After calling `CPMAddPackage` or `CPMFindPackage`, the following variables are defined in the local scope, where `<dependency>` is the name of the dependency.
 
 - `<dependency>_SOURCE_DIR` is the path to the source of the dependency.
 - `<dependency>_BINARY_DIR` is the path to the build directory of the dependency.
 - `<dependency>_ADDED` is set to `YES` if the dependency has not been added before, otherwise it is set to `NO`.
 
-For using CPM.cmake projects with external package managers, such as conan or vcpkg, setting the variable [`CPM_USE_LOCAL_PACKAGES`](#options) will make CPM.cmake try to add a package through `find_package` first, and add it from source if it doesn't succeed.
-
-In rare cases, this behaviour may be desirable by default. The function `CPMFindPackage` will try to find a local dependency via CMake's `find_package` and fallback to `CPMAddPackage`, if the dependency is not found.
+The difference between `CPMFindPackage` and `CPMAddPackage` is that `CPMFindPackage` will try to find a local dependency via CMake's `find_package` and fallback to `CPMAddPackage` if the dependency is not found.
+This behaviour can be also modified globally via [CPM options](#options).
 
 ## Full CMakeLists Example
 
@@ -91,25 +62,29 @@ add_executable(tests tests.cpp)
 
 # add dependencies
 include(cmake/CPM.cmake)
-CPMAddPackage("gh:catchorg/Catch2@2.5.0")
+
+CPMAddPackage(
+  NAME Catch2
+  GITHUB_REPOSITORY catchorg/Catch2
+  VERSION 2.5.0
+)
 
 # link dependencies
 target_link_libraries(tests Catch2)
 ```
 
-See the [examples directory](https://github.com/cpm-cmake/CPM.cmake/tree/master/examples) for complete examples with source code and check [below](#snippets) or in the [wiki](https://github.com/cpm-cmake/CPM.cmake/wiki/More-Snippets) for example snippets.
+See the [examples directory](https://github.com/TheLartians/CPM.cmake/tree/master/examples) for complete examples with source code and check [below](#snippets) or in the [wiki](https://github.com/TheLartians/CPM.cmake/wiki/More-Snippets) for example snippets.
 
 ## Adding CPM
 
-To add CPM to your current project, simply add the [latest release](https://github.com/cpm-cmake/CPM.cmake/releases/latest) of `CPM.cmake` or `get_cpm.cmake` to your project's `cmake` directory.
-The command below will perform this automatically.
+To add CPM to your current project, simply add `cmake/CPM.cmake` to your project's `cmake` directory. The command below will perform this automatically.
 
 ```bash
 mkdir -p cmake
-wget -O cmake/CPM.cmake https://github.com/cpm-cmake/CPM.cmake/releases/latest/download/get_cpm.cmake
+wget -O cmake/CPM.cmake https://github.com/TheLartians/CPM.cmake/releases/latest/download/CPM.cmake
 ```
 
-You can also download CPM.cmake directly from your project's `CMakeLists.txt`. See the [wiki](https://github.com/cpm-cmake/CPM.cmake/wiki/Downloading-CPM.cmake-in-CMake) 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
 
@@ -129,7 +104,7 @@ Dependencies using CPM will automatically use the updated script of the outermos
 ## Limitations
 
 - **No pre-built binaries** For every new build directory, all dependencies are initially downloaded and built from scratch. To avoid extra downloads it is recommend to set the [`CPM_SOURCE_CACHE`](#CPM_SOURCE_CACHE) environmental variable. Using a caching compiler such as [ccache](https://github.com/TheLartians/Ccache.cmake) can drastically reduce build time.
-- **Dependent on good CMakeLists** Many libraries do not have CMakeLists that work well for subprojects. Luckily this is slowly changing, however, until then, some manual configuration may be required (see the snippets [below](#snippets) for examples). For best practices on preparing projects for CPM, see the [wiki](https://github.com/cpm-cmake/CPM.cmake/wiki/Preparing-projects-for-CPM.cmake).
+- **Dependent on good CMakeLists** Many libraries do not have CMakeLists that work well for subprojects. Luckily this is slowly changing, however, until then, some manual configuration may be required (see the snippets [below](#snippets) for examples). For best practices on preparing projects for CPM, see the [wiki](https://github.com/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 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).
@@ -144,7 +119,7 @@ Additionally, it is difficult to cross-compile projects (e.g. for mobile), as th
 
 CPM.cmake allows dependencies to be unambiguously defined and builds them from source.
 Note that the behaviour differs from `find_package`, as variables exported to the parent scope (such as  `<PackageName>_LIBRARIES`) will not be visible after adding a package using CPM.cmake.
-The behaviour can be [achieved manually](https://github.com/cpm-cmake/CPM.cmake/issues/132#issuecomment-644955140), if required.
+The behaviour can be [achieved manually](https://github.com/TheLartians/CPM.cmake/issues/132#issuecomment-644955140), if required.
 
 ## Comparison to pure FetchContent / ExternalProject
 
@@ -152,14 +127,15 @@ CPM.cmake is a wrapper for CMake's FetchContent module and adds a number of feat
 The most notable features are:
 
 - A simpler to use API
-- Version checking: CPM.cmake will check the version number of any added dependency and emit a warning if another dependency requires a more recent version.
+- Version checking: CPM.cmake will check the version number of any added dependency and omit a warning if another dependency requires a more recent version.
+- Options: any Options passed to a dependency are stored and compared on later use, so if another dependency tries to add an existing dependency with incompatible options a warning will be emitted to the user.
 - Offline builds: CPM.cmake will override CMake's download and update commands, which allows new builds to be configured while offline if all dependencies [are available locally](#cpm_source_cache).
 - Automatic shallow clone: if a version tag (e.g. `v2.2.0`) is provided and `CPM_SOURCE_CACHE` is used, CPM.cmake will perform a shallow clone of the dependency, which should be significantly faster while using less storage than a full clone.
 - Overridable: all `CPMAddPackage` can be configured to use `find_package` by setting a [CMake flag](#cpm_use_local_packages), making it easy to integrate into projects that may require local versioning through the system's package manager.
 - [Package lock files](#package-lock) for easier transitive dependency management.
 - Dependencies can be overridden [per-build](#local-package-override) using CMake CLI parameters.
 
-ExternalProject works similarly as FetchContent, however waits with adding dependencies until build time.
+ExternalProject works similarly as FetchContent, however waits with adding dependencies until build time. 
 This has a quite a few disadvantages, especially as it makes using custom toolchains / cross-compiling very difficult and can lead to problems with nested dependencies.
 
 ## Options
@@ -176,14 +152,11 @@ 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.
 
-You can use `CPM_SOURCE_CACHE` on GitHub Actions workflows [cache](https://github.com/actions/cache) and combine it with ccache, to make your CI faster. See the [wiki](https://github.com/cpm-cmake/CPM.cmake/wiki/Caching-with-CPM.cmake-and-ccache-on-GitHub-Actions) for more info.
-
 ### 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.
-This can be controlled on a per package basis with the `CPM_DOWNLOAD_<dependency name>` variable.
 
 ### CPM_USE_LOCAL_PACKAGES
 
@@ -191,18 +164,11 @@ CPM can be configured to use `find_package` to search for locally installed depe
 If the option `CPM_LOCAL_PACKAGES_ONLY` is set, CPM will emit an error if the dependency is not found locally.
 These options can also be set as environmental variables.
 
-In the case that `find_package` requires additional arguments, the parameter `FIND_PACKAGE_ARGUMENTS` may be specified in the `CPMAddPackage` call. The value of this parameter will be forwarded to `find_package`.
-
-### CPM_USE_NAMED_CACHE_DIRECTORIES
-
-If set, CPM use additional directory level in cache to improve readability of packages names in IDEs like CLion. It changes cache structure, so all dependencies are downloaded again. There is no problem to mix both structures in one cache directory but then there may be 2 copies of some dependencies.
-This can also be set as an environmental variable.
-
 ## Local package override
 
 Library developers are often in the situation where they work on a locally checked out dependency at the same time as on a consumer project.
 It is possible to override the consumer's dependency with the version by supplying the CMake option `CPM_<dependency name>_SOURCE` set to the absolute path of the local library.
-For example, to use the local version of the dependency `Dep` at the path `/path/to/dep`, the consumer can be built with the following command.
+For example, to use the local version of the dependency `Dep` at the path `/path/to/dep`, the consumer can be built with the following command. 
 
 ```bash
 cmake -Bbuild -DCPM_Dep_SOURCE=/path/to/dep
@@ -225,17 +191,18 @@ cmake -Bbuild
 cmake --build build --target cpm-update-package-lock
 ```
 
-See the [wiki](https://github.com/cpm-cmake/CPM.cmake/wiki/Package-lock) for more info.
+See the [wiki](https://github.com/TheLartians/CPM.cmake/wiki/Package-lock) for more info.
+
 
 ## Built with CPM.cmake
 
-Some amazing projects that are built using the CPM.cmake package manager.
+Some amazing projects that are built using the CPM.cmake package manager. 
 If you know others, feel free to add them here through a PR.
 
 <table>
   <tr>
     <td>
-      <a href="https://bitfieldaudio.com">
+      <a href="https://otto-project.github.io">
         <p align="center">
           <img src="https://avatars2.githubusercontent.com/u/40357059?s=200&v=4"  alt="otto-project" height=100pt width=100pt />
         </p>
@@ -264,60 +231,55 @@ If you know others, feel free to add them here through a PR.
 ## Snippets
 
 These examples demonstrate how to include some well-known projects with CPM.
-See the [wiki](https://github.com/cpm-cmake/CPM.cmake/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)
 
-```cmake
-CPMAddPackage("gh:catchorg/Catch2@2.5.0")
-```
-
-### [Range-v3](https://github.com/ericniebler/range-v3)
-
-```Cmake
-CPMAddPackage("gh:ericniebler/range-v3#0.11.0")
-```
-
-### [Yaml-cpp](https://github.com/jbeder/yaml-cpp)
-
-```CMake
-# as the tag is in an unusual format, we need to explicitly specify the version
-CPMAddPackage("gh:jbeder/yaml-cpp#yaml-cpp-0.6.3@0.6.3")
-```
-
-### [nlohmann/json](https://github.com/nlohmann/json)
-
 ```cmake
 CPMAddPackage(
-  NAME nlohmann_json
-  VERSION 3.9.1
-  GITHUB_REPOSITORY nlohmann/json
-  OPTIONS 
-    "JSON_BuildTests OFF"
+  NAME Catch2
+  GITHUB_REPOSITORY catchorg/Catch2
+  VERSION 2.5.0
 )
 ```
 
-### [Boost ](https://github.com/boostorg/boost)
+### [Boost (via boost-cmake)](https://github.com/Orphis/boost-cmake)
 
 ```CMake
-# boost is a huge project and will take a while to download
-# using `CPM_SOURCE_CACHE` is strongly recommended
 CPMAddPackage(
-  NAME Boost
-  VERSION 1.77.0
-  GITHUB_REPOSITORY "boostorg/boost"
-  GIT_TAG "boost-1.77.0"
+  NAME boost-cmake
+  GITHUB_REPOSITORY Orphis/boost-cmake
+  VERSION 1.67.0
 )
 ```
 
 ### [cxxopts](https://github.com/jarro2783/cxxopts)
 
 ```cmake
-# the install option has to be explicitly set to allow installation
 CPMAddPackage(
+  NAME cxxopts
   GITHUB_REPOSITORY jarro2783/cxxopts
-  VERSION 2.2.1
-  OPTIONS "CXXOPTS_BUILD_EXAMPLES NO" "CXXOPTS_BUILD_TESTS NO" "CXXOPTS_ENABLE_INSTALL YES"
+  VERSION 2.2.0
+  OPTIONS
+    "CXXOPTS_BUILD_EXAMPLES Off"
+    "CXXOPTS_BUILD_TESTS Off"
+)
+```
+
+### [Yaml-cpp](https://github.com/jbeder/yaml-cpp)
+
+```CMake
+CPMAddPackage(
+  NAME yaml-cpp
+  GITHUB_REPOSITORY jbeder/yaml-cpp
+  # 0.6.2 uses deprecated CMake syntax
+  VERSION 0.6.3
+  # 0.6.3 is not released yet, so use a recent commit
+  GIT_TAG 012269756149ae99745b6dafefd415843d7420bb 
+  OPTIONS
+    "YAML_CPP_BUILD_TESTS Off"
+    "YAML_CPP_BUILD_CONTRIB Off"
+    "YAML_CPP_BUILD_TOOLS Off"
 )
 ```
 
@@ -327,13 +289,48 @@ CPMAddPackage(
 CPMAddPackage(
   NAME benchmark
   GITHUB_REPOSITORY google/benchmark
-  VERSION 1.5.2
-  OPTIONS "BENCHMARK_ENABLE_TESTING Off"
+  VERSION 1.4.1
+  OPTIONS
+    "BENCHMARK_ENABLE_TESTING Off"
 )
 
-if(benchmark_ADDED)
-  # enable c++11 to avoid compilation errors
-  set_target_properties(benchmark PROPERTIES CXX_STANDARD 11)
+if (benchmark_ADDED)
+  # compile with C++17
+  set_target_properties(benchmark PROPERTIES CXX_STANDARD 17)
+endif()
+```
+
+### [nlohmann/json](https://github.com/nlohmann/json)
+
+```cmake
+CPMAddPackage(
+  NAME nlohmann_json
+  VERSION 3.6.1  
+  # the git repo is incredibly large, so we download the archived include directory
+  URL https://github.com/nlohmann/json/releases/download/v3.6.1/include.zip
+  URL_HASH SHA256=69cc88207ce91347ea530b227ff0776db82dcb8de6704e1a3d74f4841bc651cf
+)
+
+if (nlohmann_json_ADDED)
+  add_library(nlohmann_json INTERFACE IMPORTED)
+  target_include_directories(nlohmann_json INTERFACE ${nlohmann_json_SOURCE_DIR})
+endif()
+```
+
+### [Range-v3](https://github.com/ericniebler/range-v3)
+
+```Cmake
+CPMAddPackage(
+  NAME range-v3
+  URL https://github.com/ericniebler/range-v3/archive/0.5.0.zip
+  VERSION 0.5.0
+  # the range-v3 CMakeLists screws with configuration options
+  DOWNLOAD_ONLY True
+)
+
+if(range-v3_ADDED) 
+  add_library(range-v3 INTERFACE IMPORTED)
+  target_include_directories(range-v3 INTERFACE "${range-v3_SOURCE_DIR}/include")
 endif()
 ```
 
@@ -351,7 +348,6 @@ if (lua_ADDED)
   # lua has no CMake support, so we create our own target
 
   FILE(GLOB lua_sources ${lua_SOURCE_DIR}/*.c)
-  list(REMOVE_ITEM lua_sources "${lua_SOURCE_DIR}/lua.c" "${lua_SOURCE_DIR}/luac.c")
   add_library(lua STATIC ${lua_sources})
 
   target_include_directories(lua
@@ -365,4 +361,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/cpm-cmake/CPM.cmake/tree/master/examples) for full examples with source code and check out the [wiki](https://github.com/cpm-cmake/CPM.cmake/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/get_cpm.cmake

@@ -1,8 +1,6 @@
-set(CPM_DOWNLOAD_VERSION 1.0.0-development-version)
+set(CPM_DOWNLOAD_VERSION 0.27.2-development-version)
 
 if(CPM_SOURCE_CACHE)
-  # Expand relative path. This is important if the provided path contains a tilde (~)
-  get_filename_component(CPM_SOURCE_CACHE ${CPM_SOURCE_CACHE} ABSOLUTE)
   set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
 elseif(DEFINED ENV{CPM_SOURCE_CACHE})
   set(CPM_DOWNLOAD_LOCATION "$ENV{CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
@@ -13,7 +11,7 @@ endif()
 if(NOT (EXISTS ${CPM_DOWNLOAD_LOCATION}))
   message(STATUS "Downloading CPM.cmake to ${CPM_DOWNLOAD_LOCATION}")
   file(DOWNLOAD
-       https://github.com/cpm-cmake/CPM.cmake/releases/download/v${CPM_DOWNLOAD_VERSION}/CPM.cmake
+       https://github.com/TheLartians/CPM.cmake/releases/download/v${CPM_DOWNLOAD_VERSION}/CPM.cmake
        ${CPM_DOWNLOAD_LOCATION}
   )
 endif()

cmake/testing.cmake

@@ -1,81 +1,34 @@
+
 function(ASSERT_EQUAL)
-  if(NOT ARGC EQUAL 2)
+  if (NOT ARGC EQUAL 2) 
     message(FATAL_ERROR "assertion failed: invalid argument count: ${ARGC}")
   endif()
 
-  if(NOT "${ARGV0}" STREQUAL "${ARGV1}")
+  if (NOT ${ARGV0} STREQUAL ${ARGV1})
     message(FATAL_ERROR "assertion failed: '${ARGV0}' != '${ARGV1}'")
   else()
     message(STATUS "test passed: '${ARGV0}' == '${ARGV1}'")
   endif()
 endfunction()
 
-function(ASSERT_NOT_EQUAL)
-  if(NOT ARGC EQUAL 2)
-    message(FATAL_ERROR "assertion failed: invalid argument count: ${ARGC}")
-  endif()
-
-  if("${ARGV0}" STREQUAL "${ARGV1}")
-    message(FATAL_ERROR "assertion failed: '${ARGV0}' == '${ARGV1}'")
-  else()
-    message(STATUS "test passed: '${ARGV0}' != '${ARGV1}'")
-  endif()
-endfunction()
-
 function(ASSERT_EMPTY)
-  if(NOT ARGC EQUAL 0)
+  if (NOT ARGC EQUAL 0) 
     message(FATAL_ERROR "assertion failed: input ${ARGC} not empty: '${ARGV}'")
   endif()
 endfunction()
 
-function(ASSERT_DEFINED KEY)
-  if(DEFINED ${KEY})
-    message(STATUS "test passed: '${KEY}' is defined")
-  else()
-    message(FATAL_ERROR "assertion failed: '${KEY}' is not defiend")
-  endif()
-endfunction()
-
-function(ASSERT_NOT_DEFINED KEY)
-  if(DEFINED ${KEY})
-    message(FATAL_ERROR "assertion failed: '${KEY}' is defiend (${${KEY}})")
-  else()
-    message(STATUS "test passed: '${KEY}' is not defined")
-  endif()
-endfunction()
-
-function(ASSERT_TRUTHY KEY)
-  if(${${KEY}})
-    message(STATUS "test passed: '${KEY}' is set truthy")
-  else()
-    message(FATAL_ERROR "assertion failed: value of '${KEY}' is not truthy (${${KEY}})")
-  endif()
-endfunction()
-
-function(ASSERT_FALSY KEY)
-  if(${${KEY}})
-    message(FATAL_ERROR "assertion failed: value of '${KEY}' is not falsy (${${KEY}})")
-  else()
-    message(STATUS "test passed: '${KEY}' is set falsy")
-  endif()
-endfunction()
-
 function(ASSERTION_FAILED)
   message(FATAL_ERROR "assertion failed: ${ARGN}")
 endfunction()
 
 function(ASSERT_EXISTS file)
-  if(EXISTS ${file})
-    message(STATUS "test passed: '${file}' exists")
-  else()
+  if (NOT EXISTS ${file}) 
     message(FATAL_ERROR "assertion failed: file ${file} does not exist")
   endif()
 endfunction()
 
 function(ASSERT_NOT_EXISTS file)
-  if(NOT EXISTS ${file})
-    message(STATUS "test passed: '${file}' does not exist")
-  else()
+  if (EXISTS ${file}) 
     message(FATAL_ERROR "assertion failed: file ${file} exists")
   endif()
 endfunction()

examples/TestingFramework/CMakeLists.txt

@@ -1,7 +0,0 @@
-cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
-
-project(CPMTestingFrameworkExample)
-
-include(../../cmake/CPM.cmake)
-CPMAddPackage("bb:HEMRND/TestingFramework@0.4.1")
-add_test_suites(TESTS SomeTest)

examples/TestingFramework/SomeTest.cpp

@@ -1,19 +0,0 @@
-#include <HEM/TestingFramework.hpp>
-
-using namespace fakeit;
-
-class ITest {
-public:
-  virtual int getInt() = 0;
-};
-
-TEST_CASE("Testing Framework Test") {
-  constexpr int someIntValue = 123456;
-
-  Mock<ITest> testMock;
-  When(Method(testMock, getInt)).Return(someIntValue);
-
-  int readValue = testMock.get().getInt();
-
-  REQUIRE(readValue == someIntValue);
-}

examples/asio-standalone/CMakeLists.txt

@@ -8,35 +8,48 @@ include(../../cmake/CPM.cmake)
 
 find_package(Threads REQUIRED)
 
-CPMAddPackage("gh:chriskohlhoff/asio#asio-1-18-1@1.18.1")
+CPMAddPackage(
+  NAME asio
+  VERSION 1.16.1
+  GITHUB_REPOSITORY chriskohlhoff/asio
+  GIT_TAG asio-1-16-1   # asio uses non-standard version tag, we must specify GIT_TAG
+)
 
-# ASIO doesn't use CMake, we have to configure it manually. Extra notes for using on Windows:
-#
-# 1) If _WIN32_WINNT is not set, ASIO assumes _WIN32_WINNT=0x0501, i.e. Windows XP target, which is
-# definitely not the platform which most users target.
-#
+# ASIO doesn't use CMake, we have to configure it manually.
+# Extra notes for using on Windows:
+# 1) If _WIN32_WINNT is not set, ASIO assumes _WIN32_WINNT=0x0501, i.e. Windows XP target,
+# which is definitely not the platform which most users target.
 # 2) WIN32_LEAN_AND_MEAN is defined to make Winsock2 work.
 if(asio_ADDED)
   add_library(asio INTERFACE)
 
-  target_include_directories(asio SYSTEM INTERFACE ${asio_SOURCE_DIR}/asio/include)
+  target_include_directories(asio
+    INTERFACE ${asio_SOURCE_DIR}/asio/include
+  )
 
-  target_compile_definitions(asio INTERFACE ASIO_STANDALONE ASIO_NO_DEPRECATED)
+  target_compile_definitions(asio
+    INTERFACE
+      ASIO_STANDALONE
+      ASIO_NO_DEPRECATED
+  )
 
-  target_link_libraries(asio INTERFACE Threads::Threads)
+  target_link_libraries(asio
+    INTERFACE
+      Threads::Threads
+  )
 
   if(WIN32)
     # macro see @ https://stackoverflow.com/a/40217291/1746503
     macro(get_win32_winnt version)
-      if(CMAKE_SYSTEM_VERSION)
+      if (CMAKE_SYSTEM_VERSION)
         set(ver ${CMAKE_SYSTEM_VERSION})
         string(REGEX MATCH "^([0-9]+).([0-9])" ver ${ver})
         string(REGEX MATCH "^([0-9]+)" verMajor ${ver})
         # Check for Windows 10, b/c we'll need to convert to hex 'A'.
-        if("${verMajor}" MATCHES "10")
+        if ("${verMajor}" MATCHES "10")
           set(verMajor "A")
           string(REGEX REPLACE "^([0-9]+)" ${verMajor} ver ${ver})
-        endif("${verMajor}" MATCHES "10")
+        endif ("${verMajor}" MATCHES "10")
         # Remove all remaining '.' characters.
         string(REPLACE "." "" ver ${ver})
         # Prepend each digit with a zero.
@@ -52,7 +65,11 @@ if(asio_ADDED)
 
     message(STATUS "Set _WIN32_WINNET=${_WIN32_WINNT}")
 
-    target_compile_definitions(asio INTERFACE _WIN32_WINNT=${_WIN32_WINNT} WIN32_LEAN_AND_MEAN)
+    target_compile_definitions(asio
+      INTERFACE
+        _WIN32_WINNT=${_WIN32_WINNT}
+        WIN32_LEAN_AND_MEAN
+    )
   endif()
 endif()
 
@@ -60,4 +77,3 @@ endif()
 
 add_executable(CPMExampleASIOStandalone main.cpp)
 target_link_libraries(CPMExampleASIOStandalone asio)
-target_compile_features(CPMExampleASIOStandalone PRIVATE cxx_std_11)

examples/asio-standalone/main.cpp

@@ -20,31 +20,45 @@
 
 using asio::ip::tcp;
 
-class session : public std::enable_shared_from_this<session> {
+class session
+  : public std::enable_shared_from_this<session>
+{
 public:
-  session(tcp::socket socket) : socket_(std::move(socket)) {}
-
-  void start() { do_read(); }
-
-private:
-  void do_read() {
-    auto self(shared_from_this());
-    socket_.async_read_some(asio::buffer(data_, max_length),
-                            [this, self](std::error_code ec, std::size_t length) {
-                              if (!ec) {
-                                do_write(length);
-                              }
-                            });
+  session(tcp::socket socket)
+    : socket_(std::move(socket))
+  {
   }
 
-  void do_write(std::size_t length) {
+  void start()
+  {
+    do_read();
+  }
+
+private:
+  void do_read()
+  {
+    auto self(shared_from_this());
+    socket_.async_read_some(asio::buffer(data_, max_length),
+        [this, self](std::error_code ec, std::size_t length)
+        {
+          if (!ec)
+          {
+            do_write(length);
+          }
+        });
+  }
+
+  void do_write(std::size_t length)
+  {
     auto self(shared_from_this());
     asio::async_write(socket_, asio::buffer(data_, length),
-                      [this, self](std::error_code ec, std::size_t /*length*/) {
-                        if (!ec) {
-                          do_read();
-                        }
-                      });
+        [this, self](std::error_code ec, std::size_t /*length*/)
+        {
+          if (!ec)
+          {
+            do_read();
+          }
+        });
   }
 
   tcp::socket socket_;
@@ -52,30 +66,39 @@ private:
   char data_[max_length];
 };
 
-class server {
+class server
+{
 public:
   server(asio::io_context& io_context, short port)
-      : acceptor_(io_context, tcp::endpoint(tcp::v4(), port)) {
+    : acceptor_(io_context, tcp::endpoint(tcp::v4(), port))
+  {
     do_accept();
   }
 
 private:
-  void do_accept() {
-    acceptor_.async_accept([this](std::error_code ec, tcp::socket socket) {
-      if (!ec) {
-        std::make_shared<session>(std::move(socket))->start();
-      }
+  void do_accept()
+  {
+    acceptor_.async_accept(
+        [this](std::error_code ec, tcp::socket socket)
+        {
+          if (!ec)
+          {
+            std::make_shared<session>(std::move(socket))->start();
+          }
 
-      do_accept();
-    });
+          do_accept();
+        });
   }
 
   tcp::acceptor acceptor_;
 };
 
-int main(int argc, char* argv[]) {
-  try {
-    if (argc != 2) {
+int main(int argc, char* argv[])
+{
+  try
+  {
+    if (argc != 2)
+    {
       std::cerr << "Usage: async_tcp_echo_server <port>\n";
       return 1;
     }
@@ -85,7 +108,9 @@ int main(int argc, char* argv[]) {
     server s(io_context, std::atoi(argv[1]));
 
     io_context.run();
-  } catch (std::exception& e) {
+  }
+  catch (std::exception& e)
+  {
     std::cerr << "Exception: " << e.what() << "\n";
   }
 

examples/benchmark/CMakeLists.txt

@@ -6,22 +6,27 @@ project(CPMExampleBenchmark)
 
 include(../../cmake/CPM.cmake)
 
-CPMAddPackage("gh:cpm-cmake/testpack-fibonacci@2.0")
+CPMAddPackage(
+  NAME fibonacci
+  GITLAB_REPOSITORY TheLartians/Fibonacci
+  VERSION 2.0
+)
 
 CPMAddPackage(
   NAME benchmark
   GITHUB_REPOSITORY google/benchmark
-  VERSION 1.5.2
-  OPTIONS "BENCHMARK_ENABLE_TESTING Off"
+  VERSION 1.5.0
+  OPTIONS
+    "BENCHMARK_ENABLE_TESTING Off"
 )
 
-if(benchmark_ADDED)
-  # enable c++11 to avoid compilation errors
-  set_target_properties(benchmark PROPERTIES CXX_STANDARD 11)
+if (benchmark_ADDED)
+  # patch google benchmark target
+  set_target_properties(benchmark PROPERTIES CXX_STANDARD 17)
 endif()
 
 # ---- Executable ----
 
 add_executable(CPMExampleBenchmark "main.cpp")
+set_target_properties(CPMExampleBenchmark PROPERTIES CXX_STANDARD 17)        
 target_link_libraries(CPMExampleBenchmark fibonacci benchmark)
-target_compile_features(CPMExampleBenchmark PRIVATE cxx_std_17)

examples/benchmark/main.cpp

@@ -1,13 +1,14 @@
 #include <benchmark/benchmark.h>
-#include <fibonacci.h>
-
+#include <vector>
 #include <algorithm>
 #include <random>
-#include <vector>
 
-std::vector<unsigned> createTestNumbers() {
+#include <fibonacci.h>
+
+
+std::vector<unsigned> createTestNumbers(){
   std::vector<unsigned> v;
-  for (int i = 0; i < 25; ++i) v.emplace_back(i);
+  for (int i=0;i<25;++i) v.emplace_back(i);
   std::random_device rd;
   std::mt19937 g(rd());
   std::shuffle(v.begin(), v.end(), g);
@@ -17,7 +18,7 @@ std::vector<unsigned> createTestNumbers() {
 void fibonacci(benchmark::State& state) {
   auto numbers = createTestNumbers();
   for (auto _ : state) {
-    for (auto v : numbers) benchmark::DoNotOptimize(fibonacci(v));
+    for (auto v: numbers) benchmark::DoNotOptimize(fibonacci(v));
   }
 }
 
@@ -26,7 +27,7 @@ BENCHMARK(fibonacci);
 void fastFibonacci(benchmark::State& state) {
   auto numbers = createTestNumbers();
   for (auto _ : state) {
-    for (auto v : numbers) benchmark::DoNotOptimize(fastFibonacci(v));
+    for (auto v: numbers) benchmark::DoNotOptimize(fastFibonacci(v));
   }
 }
 

examples/boost/CMakeLists.txt

@@ -5,17 +5,17 @@ project(CPMExampleBoost)
 # ---- Create binary ----
 
 add_executable(CPMExampleBoost main.cpp)
-target_compile_features(CPMExampleBoost PRIVATE cxx_std_17)
+set_target_properties(CPMExampleBoost PROPERTIES CXX_STANDARD 17)
 
 # ---- Dependencies ----
 
 include(../../cmake/CPM.cmake)
 
-CPMAddPackage(
+CPMFindPackage(
   NAME Boost
-  VERSION 1.77.0
-  GITHUB_REPOSITORY "boostorg/boost"
-  GIT_TAG "boost-1.77.0"
+  GITHUB_REPOSITORY Orphis/boost-cmake
+  VERSION 1.67.0
+  FIND_PACKAGE_ARGUMENTS "COMPONENTS system"
 )
 
-target_link_libraries(CPMExampleBoost PRIVATE Boost::asio)
+target_link_libraries(CPMExampleBoost PRIVATE Boost::system pthread)

examples/boost/main.cpp

@@ -8,13 +8,17 @@
 // 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>
-#include <iostream>
 
-void print(const boost::system::error_code& /*e*/) { std::cout << "Hello, world!" << std::endl; }
+void print(const boost::system::error_code& /*e*/)
+{
+  std::cout << "Hello, world!" << std::endl;
+}
 
-int main() {
+int main()
+{
   boost::asio::io_service io;
 
   boost::asio::deadline_timer t(io, boost::posix_time::seconds(1));

examples/build_all.py

@@ -1,7 +1,5 @@
 #!/usr/bin/python3
 
-import os
-
 from pathlib import Path
 from subprocess import PIPE, run
 
@@ -11,23 +9,21 @@ examples = [
 
 assert(len(examples) > 0)
 
-
 def runCommand(command):
   print('- %s' % command)
   result = run(command, stdout=PIPE, stderr=PIPE, universal_newlines=True, shell=True)
   if result.returncode != 0:
-    print("error while running '%s':\n" % command, '  ' + str(result.stderr).replace('\n', '\n  '))
+    print("error while running '%s':\n" % command, '  ' + str(result.stderr).replace('\n','\n  '))
     exit(result.returncode)
   return result.stdout
 
-
 print('')
 for example in examples:
   print("running example %s" % example.name)
   print("================" + ('=' * len(example.name)))
   project = Path(".") / 'build' / example.name
-  configure = runCommand('cmake -S%s -B%s' % (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 -- -j%i' % (project, os.cpu_count() / 2))
+  build = runCommand('cmake --build %s -j4' % (project))
   print('  ' + '\n  '.join([line for line in build.split('\n') if 'Built target' in line]))
   print('')

examples/catch2/CMakeLists.txt

@@ -6,16 +6,25 @@ project(CPMExampleCatch2)
 
 include(../../cmake/CPM.cmake)
 
-CPMAddPackage("gh:cpm-cmake/testpack-fibonacci@2.0")
-CPMAddPackage("gh:catchorg/Catch2@2.13.4")
+CPMAddPackage(
+  NAME fibonacci
+  GITHUB_REPOSITORY TheLartians/Fibonacci
+  VERSION 2.0
+)
+
+CPMAddPackage(
+  NAME Catch2
+  GITHUB_REPOSITORY catchorg/Catch2
+  VERSION 2.5.0
+)
 
 # ---- Create binary ----
 
 add_executable(CPMExampleCatch2 main.cpp)
 target_link_libraries(CPMExampleCatch2 fibonacci Catch2)
-target_compile_features(CPMExampleCatch2 PRIVATE cxx_std_17)
+set_target_properties(CPMExampleCatch2 PROPERTIES CXX_STANDARD 17)
 
 # ---- Enable testing ----
 
-enable_testing()
-add_test(CPMExampleCatch2 CPMExampleCatch2)
+ENABLE_TESTING() 
+ADD_TEST(CPMExampleCatch2 CPMExampleCatch2)

examples/catch2/main.cpp

@@ -1,10 +1,9 @@
 #define CATCH_CONFIG_MAIN
 
+#include <catch2/catch.hpp>
 #include <fibonacci.h>
 
-#include <catch2/catch.hpp>
-
-TEST_CASE("fibonacci") {
+TEST_CASE("fibonacci"){
   REQUIRE(fibonacci(0) == 0);
   REQUIRE(fibonacci(1) == 1);
   REQUIRE(fibonacci(2) == 1);
@@ -14,8 +13,8 @@ TEST_CASE("fibonacci") {
   REQUIRE(fibonacci(13) == 233);
 }
 
-TEST_CASE("fastFibonacci") {
-  for (unsigned i = 0; i < 25; ++i) {
+TEST_CASE("fastFibonacci"){
+  for (unsigned i=0; i<25; ++i){
     REQUIRE(fibonacci(i) == fastFibonacci(i));
   }
 }

examples/cereal/CMakeLists.txt

@@ -8,13 +8,15 @@ include(../../cmake/CPM.cmake)
 
 CPMAddPackage(
   NAME cereal
-  VERSION 1.3.0
+  VERSION 1.2.2
   GITHUB_REPOSITORY USCiLab/cereal
-  OPTIONS "SKIP_PORTABILITY_TEST ON" "JUST_INSTALL_CEREAL ON"
+  OPTIONS
+    "SKIP_PORTABILITY_TEST ON"
+    "JUST_INSTALL_CEREAL ON"
 )
 
 # ---- Create binary ----
 
 add_executable(CPMExampleCereal main.cpp)
-target_link_libraries(CPMExampleCereal cereal)
-target_compile_features(CPMExampleCereal PRIVATE cxx_std_17)
+target_link_libraries(CPMExampleCereal cereal )
+set_target_properties(CPMExampleCereal PROPERTIES CXX_STANDARD 17)

examples/cereal/main.cpp

@@ -1,20 +1,28 @@
 #define CATCH_CONFIG_MAIN
 
-#include <cereal/archives/json.hpp>
 #include <cereal/cereal.hpp>
-#include <sstream>
-#include <string>
+#include <cereal/archives/json.hpp>
 
-struct player_data {
+#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));
+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[]) {
+int main(int argc, char const *argv[])
+{
   player_data player{3, "Gamer One"};
   std::ostringstream oss;
   cereal::JSONOutputArchive output(oss);

examples/cxxopts/CMakeLists.txt

@@ -6,10 +6,17 @@ project(CPMExampleCXXOpts)
 
 include(../../cmake/CPM.cmake)
 
-CPMAddPackage("gh:jarro2783/cxxopts@2.2.0")
+CPMAddPackage(
+  NAME cxxopts
+  GITHUB_REPOSITORY jarro2783/cxxopts
+  VERSION 2.2.0
+  OPTIONS
+    "CXXOPTS_BUILD_EXAMPLES Off"
+    "CXXOPTS_BUILD_TESTS Off"
+)
 
 # ---- Create binary ----
 
 add_executable(CPMExampleCXXOpts main.cpp)
 target_link_libraries(CPMExampleCXXOpts cxxopts)
-target_compile_features(CPMExampleCXXOpts PRIVATE cxx_std_17)
+set_target_properties(CPMExampleCXXOpts PROPERTIES CXX_STANDARD 17)

examples/cxxopts/main.cpp

@@ -1,25 +1,21 @@
 #include <cxxopts.hpp>
 #include <iostream>
 
-int main(int argc, char** argv) {
+int main(int argc, char ** argv) {
   cxxopts::Options options("MyProgram", "One line description of MyProgram");
-
-  // clang-format off
   options.add_options()
     ("h,help", "Show help")
     ("d,debug", "Enable debugging")
-    ("f,file", "File name", cxxopts::value<std::string>()
-  );
-  // clang-format on
+    ("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()) {
+  for (auto arg: result.arguments()) {
     std::cout << "option: " << arg.key() << ": " << arg.value() << std::endl;
   }
 

examples/doctest/CMakeLists.txt

@@ -6,16 +6,25 @@ project(CPMExampleDoctest)
 
 include(../../cmake/CPM.cmake)
 
-CPMAddPackage("gh:cpm-cmake/testpack-fibonacci@2.0")
-CPMAddPackage("gh:onqtam/doctest#2.4.5")
+CPMAddPackage(
+  NAME fibonacci
+  GITLAB_REPOSITORY TheLartians/Fibonacci
+  VERSION 2.0
+)
+
+CPMAddPackage(
+  NAME doctest
+  GITHUB_REPOSITORY onqtam/doctest
+  GIT_TAG 2.3.2
+)
 
 # ---- Create binary ----
 
 add_executable(CPMExampleDoctest main.cpp)
 target_link_libraries(CPMExampleDoctest fibonacci doctest)
-target_compile_features(CPMExampleDoctest PRIVATE cxx_std_17)
+set_target_properties(CPMExampleDoctest PROPERTIES CXX_STANDARD 17)
 
 # ---- Enable testing ----
 
-enable_testing()
-add_test(CPMExampleDoctest CPMExampleDoctest)
+ENABLE_TESTING() 
+ADD_TEST(CPMExampleDoctest CPMExampleDoctest)

examples/doctest/main.cpp

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

examples/entt/CMakeLists.txt

@@ -14,13 +14,13 @@ CPMAddPackage(
   DOWNLOAD_ONLY True
 )
 
-if(EnTT_ADDED)
+if (EnTT_ADDED)
   add_library(EnTT INTERFACE)
-  target_include_directories(EnTT SYSTEM INTERFACE ${EnTT_SOURCE_DIR}/src)
+  target_include_directories(EnTT INTERFACE ${EnTT_SOURCE_DIR}/src)
 endif()
 
 # ---- Executable ----
 
-add_executable(CPMEnTTExample main.cpp)
-target_compile_features(CPMEnTTExample PRIVATE cxx_std_17)
+add_executable(CPMEnTTExample "main.cpp")
+set_target_properties(CPMEnTTExample PROPERTIES CXX_STANDARD 17)        
 target_link_libraries(CPMEnTTExample EnTT)

examples/entt/main.cpp

@@ -1,56 +1,54 @@
-#include <cstdint>
 #include <entt/entt.hpp>
+#include <cstdint>
 
 struct position {
-  float x;
-  float y;
+    float x;
+    float y;
 };
 
 struct velocity {
-  float dx;
-  float dy;
+    float dx;
+    float dy;
 };
 
 void update(entt::registry &registry) {
-  auto view = registry.view<position, velocity>();
+    auto view = registry.view<position, velocity>();
 
-  for (auto entity : view) {
-    // gets only the components that are going to be used ...
+    for(auto entity: view) {
+        // gets only the components that are going to be used ...
 
-    auto &vel = view.get<velocity>(entity);
+        auto &vel = view.get<velocity>(entity);
 
-    vel.dx = 0.;
-    vel.dy = 0.;
+        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 ...
+    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;
+        pos.x += vel.dx * dt;
+        pos.y += vel.dy * dt;
 
-    // ...
-  });
+        // ...
+    });
 }
 
 int main() {
-  entt::registry registry;
-  std::uint64_t dt = 16;
+    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);
+    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);
+    update(dt, registry);
+    update(registry);
 
-  // ...
+    // ...
 }

examples/fmt/CMakeLists.txt

@@ -6,10 +6,14 @@ project(CPMJSONExample)
 
 include(../../cmake/CPM.cmake)
 
-CPMAddPackage("gh:fmtlib/fmt#7.1.3")
+CPMAddPackage(
+  NAME fmt
+  GIT_TAG 6.1.2
+  GITHUB_REPOSITORY fmtlib/fmt
+)
 
 # ---- Executable ----
 
-add_executable(CPMFmtExample main.cpp)
-target_compile_features(CPMFmtExample PRIVATE cxx_std_17)
+add_executable(CPMFmtExample "main.cpp")
+set_target_properties(CPMFmtExample PROPERTIES CXX_STANDARD 17)        
 target_link_libraries(CPMFmtExample fmt)

examples/fmt/main.cpp

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

examples/gtest/CMakeLists.txt

@@ -6,23 +6,29 @@ project(CPMExampleGtest)
 
 include(../../cmake/CPM.cmake)
 
-CPMAddPackage("gh:cpm-cmake/testpack-fibonacci@2.0")
+CPMAddPackage(
+  NAME fibonacci
+  GITLAB_REPOSITORY TheLartians/Fibonacci
+  VERSION 2.0
+)
 
 CPMAddPackage(
   NAME googletest
   GITHUB_REPOSITORY google/googletest
-  GIT_TAG release-1.10.0
-  VERSION 1.10.0
-  OPTIONS "INSTALL_GTEST OFF" "gtest_force_shared_crt"
+  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)
-target_compile_features(CPMExampleGtest PRIVATE cxx_std_17)
+set_target_properties(CPMExampleGtest PROPERTIES CXX_STANDARD 17)
 
 # ---- Enable testing ----
 
-enable_testing()
+enable_testing() 
 add_test(CPMExampleGtest CPMExampleGtest)

examples/gtest/main.cpp

@@ -1,7 +1,8 @@
-#include <fibonacci.h>
 #include <gtest/gtest.h>
+#include <fibonacci.h>
 
-TEST(FibonacciTests, BasicChecks) {
+TEST(FibonacciTests, BasicChecks)
+{
   ASSERT_TRUE(fibonacci(0) == 0);
   ASSERT_TRUE(fibonacci(1) == 1);
   ASSERT_TRUE(fibonacci(2) == 1);

examples/json/CMakeLists.txt

@@ -5,10 +5,22 @@ project(CPMJSONExample)
 # ---- Dependencies ----
 
 include(../../cmake/CPM.cmake)
-CPMAddPackage("gh:nlohmann/json@3.10.5")
+
+CPMAddPackage(
+  NAME nlohmann_json
+  VERSION 3.6.1  
+  # not using the repo as it takes forever to clone
+  URL https://github.com/nlohmann/json/releases/download/v3.6.1/include.zip
+  URL_HASH SHA256=69cc88207ce91347ea530b227ff0776db82dcb8de6704e1a3d74f4841bc651cf
+)
+
+if(nlohmann_json_ADDED)
+  add_library(nlohmann_json INTERFACE)
+  target_include_directories(nlohmann_json INTERFACE ${nlohmann_json_SOURCE_DIR})
+endif()
 
 # ---- Executable ----
 
-add_executable(CPMJSONExample main.cpp)
-target_compile_features(CPMJSONExample PRIVATE cxx_std_17)
-target_link_libraries(CPMJSONExample nlohmann_json::nlohmann_json)
+add_executable(CPMJSONExample "main.cpp")
+set_target_properties(CPMJSONExample PROPERTIES CXX_STANDARD 17)        
+target_link_libraries(CPMJSONExample nlohmann_json)

examples/json/main.cpp

@@ -1,15 +1,23 @@
-#include <iomanip>
-#include <iostream>
 #include <nlohmann/json.hpp>
+#include <iostream>
+#include <iomanip>
 
-int main() {
-  nlohmann::json json = {{"pi", 3.141},
-                         {"happy", true},
-                         {"name", "Niels"},
-                         {"nothing", nullptr},
-                         {"answer", {{"everything", 42}}},
-                         {"list", {1, 0, 2}},
-                         {"object", {{"currency", "USD"}, {"value", 42.99}}}};
+int main(){
+  
+  nlohmann::json json = {
+    {"pi", 3.141},
+    {"happy", true},
+    {"name", "Niels"},
+    {"nothing", nullptr},
+    {"answer", {
+      {"everything", 42}
+    }},
+    {"list", {1, 0, 2}},
+    {"object", {
+      {"currency", "USD"},
+      {"value", 42.99}
+    }}
+  };
 
   std::cout << "declared JSON object: " << std::setw(2) << json << std::endl;
 

examples/linenoise/CMakeLists.txt

@@ -6,15 +6,19 @@ project(CPMlinenoiseExample)
 
 include(../../cmake/CPM.cmake)
 
-CPMAddPackage("gh:antirez/linenoise#1.0")
+CPMAddPackage(
+  NAME linenoise
+  GIT_TAG 1.0
+  GITHUB_REPOSITORY antirez/linenoise
+)
 
 if(linenoise_ADDED)
   add_library(linenoise ${linenoise_SOURCE_DIR}/linenoise.c)
-  target_include_directories(linenoise SYSTEM PUBLIC ${linenoise_SOURCE_DIR})
+  target_include_directories(linenoise PUBLIC ${linenoise_SOURCE_DIR})
 endif()
 
 # ---- Executable ----
 
-add_executable(CPMlinenoiseExample main.cpp)
-target_compile_features(CPMlinenoiseExample PRIVATE cxx_std_17)
+add_executable(CPMlinenoiseExample "main.cpp")
+set_target_properties(CPMlinenoiseExample PROPERTIES CXX_STANDARD 17)        
 target_link_libraries(CPMlinenoiseExample linenoise)

examples/linenoise/main.cpp

@@ -1,64 +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");
-  }
+    if (buf[0] == 'h') {
+        linenoiseAddCompletion(lc,"hello");
+        linenoiseAddCompletion(lc,"hello there");
+    }
 }
 
 int main(int argc, char **argv) {
-  char *line;
-  char *prgname = argv[0];
+    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);
+    /* 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);
+    /* 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 */
+    /* 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);
+    /* 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);
     }
-    free(line);
-  }
-  return 0;
+    return 0;
 }

examples/range-v3/CMakeLists.txt

@@ -6,10 +6,21 @@ project(CPMRangev3Example)
 
 include(../../cmake/CPM.cmake)
 
-CPMAddPackage("gh:ericniebler/range-v3#0.11.0")
+CPMAddPackage(
+  NAME range-v3
+  URL https://github.com/ericniebler/range-v3/archive/0.5.0.zip
+  VERSION 0.5.0
+  # the range-v3 CMakeLists screws with configuration options
+  DOWNLOAD_ONLY True
+)
+
+if(range-v3_ADDED) 
+  add_library(range-v3 INTERFACE IMPORTED)
+  target_include_directories(range-v3 INTERFACE "${range-v3_SOURCE_DIR}/include")
+endif()
 
 # ---- Executable ----
 
-add_executable(CPMRangev3Example main.cpp)
-target_compile_features(CPMRangev3Example PRIVATE cxx_std_17)
+add_executable(CPMRangev3Example "main.cpp")
+set_target_properties(CPMRangev3Example PROPERTIES CXX_STANDARD 17)        
 target_link_libraries(CPMRangev3Example range-v3)

examples/range-v3/main.cpp

@@ -18,24 +18,27 @@
 // vector all_of is_six: false
 // vector none_of is_six: false
 
-#include <iostream>
 #include <range/v3/algorithm/all_of.hpp>
 #include <range/v3/algorithm/any_of.hpp>
 #include <range/v3/algorithm/for_each.hpp>
 #include <range/v3/algorithm/none_of.hpp>
 #include <range/v3/view/all.hpp>
+
+#include <iostream>
 #include <vector>
 using std::cout;
 
 auto is_six = [](int i) { return i == 6; };
 
-int main() {
-  std::vector<int> v{6, 2, 3, 4, 5, 6};
-  cout << std::boolalpha;
-  cout << "vector: " << ranges::views::all(v) << '\n';
+int
+main()
+{
+    std::vector<int> v{6, 2, 3, 4, 5, 6};
+    cout << std::boolalpha;
+    cout << "vector: " << ranges::view::all(v) << '\n';
 
-  cout << "vector any_of is_six: " << ranges::any_of(v, is_six) << '\n';
-  cout << "vector all_of is_six: " << ranges::all_of(v, is_six) << '\n';
-  cout << "vector none_of is_six: " << ranges::none_of(v, is_six) << '\n';
+    cout << "vector any_of is_six: " << ranges::any_of(v, is_six) << '\n';
+    cout << "vector all_of is_six: " << ranges::all_of(v, is_six) << '\n';
+    cout << "vector none_of is_six: " << ranges::none_of(v, is_six) << '\n';
 }
 //[any_all_none_of]]

examples/simple_match/CMakeLists.txt

@@ -15,11 +15,12 @@ CPMAddPackage(
 
 if(simple_match_ADDED)
   add_library(simple_match INTERFACE IMPORTED)
-  target_include_directories(simple_match SYSTEM INTERFACE "${simple_match_SOURCE_DIR}/include")
+  target_include_directories(simple_match INTERFACE "${simple_match_SOURCE_DIR}/include")
 endif()
 
 # ---- Executable ----
 
-add_executable(CPMSimpleMatchExample main.cpp)
-target_compile_features(CPMSimpleMatchExample PRIVATE cxx_std_17)
+add_executable(CPMSimpleMatchExample "main.cpp")
+set_target_properties(CPMSimpleMatchExample PROPERTIES CXX_STANDARD 17)        
 target_link_libraries(CPMSimpleMatchExample simple_match)
+

examples/simple_match/main.cpp

@@ -1,7 +1,8 @@
-#include <iostream>
 #include <simple_match/simple_match.hpp>
 
-int main(int argc, char** argv) {
+#include <iostream>
+
+int main(int argc, char ** argv){
   using namespace simple_match;
   using namespace simple_match::placeholders;
 
@@ -11,23 +12,22 @@ int main(int argc, char** argv) {
   while (true) {
     std::cout << "> ";
     std::getline(std::cin, input);
-    if (input == "quit") {
-      break;
-    }
+    if (input == "quit") { break; }
     int x;
     try {
       x = std::stoi(input);
-    } catch (std::invalid_argument&) {
+    } catch(std::invalid_argument &) {
       std::cout << "invalid input" << std::endl;
       continue;
     }
-
-    match(
-        x, 1, []() { std::cout << "The answer is one\n"; }, 2,
-        []() { std::cout << "The answer is two\n"; }, _x < 10,
-        [](auto&& a) { std::cout << "The answer " << a << " is less than 10\n"; }, 10 < _x < 20,
-        [](auto&& a) { std::cout << "The answer " << a << " is between 10 and 20 exclusive\n"; }, _,
-        []() { std::cout << "Did not match\n"; });
+    
+    match(x,
+      1, []() {std::cout << "The answer is one\n"; },
+      2, []() {std::cout << "The answer is two\n"; },
+      _x < 10, [](auto&& a) {std::cout << "The answer " << a << " is less than 10\n"; },
+      10 < _x < 20,	[](auto&& a) {std::cout << "The answer " << a  << " is between 10 and 20 exclusive\n"; },
+      _, []() {std::cout << "Did not match\n"; }
+    );
   }
 
   return 0;

examples/sol2/CMakeLists.txt

@@ -13,16 +13,19 @@ CPMAddPackage(
   DOWNLOAD_ONLY YES
 )
 
-if(lua_ADDED)
+if (lua_ADDED)
   # lua has no CMakeLists, so we create our own target
 
-  file(GLOB lua_sources ${lua_SOURCE_DIR}/*.c)
-  list(REMOVE_ITEM lua_sources "${lua_SOURCE_DIR}/lua.c" "${lua_SOURCE_DIR}/luac.c")
+  FILE(GLOB lua_sources ${lua_SOURCE_DIR}/*.c)
   add_library(lua STATIC ${lua_sources})
 
-  target_include_directories(lua SYSTEM PUBLIC $<BUILD_INTERFACE:${lua_SOURCE_DIR}>)
+  target_include_directories(lua
+    PUBLIC
+      $<BUILD_INTERFACE:${lua_SOURCE_DIR}>
+  )
 endif()
 
+
 CPMAddPackage(
   NAME sol2
   URL https://github.com/ThePhD/sol2/archive/v3.0.2.zip
@@ -30,14 +33,15 @@ CPMAddPackage(
   DOWNLOAD_ONLY YES
 )
 
-if(sol2_ADDED)
+if (sol2_ADDED)
   add_library(sol2 INTERFACE IMPORTED)
-  target_include_directories(sol2 SYSTEM INTERFACE ${sol2_SOURCE_DIR}/include)
+  target_include_directories(sol2 INTERFACE ${sol2_SOURCE_DIR}/include)
   target_link_libraries(sol2 INTERFACE lua)
 endif()
 
 # ---- Executable ----
 
-add_executable(CPMSol2Example main.cpp)
-target_compile_features(CPMSol2Example PRIVATE cxx_std_17)
+add_executable(CPMSol2Example "main.cpp")
+set_target_properties(CPMSol2Example PROPERTIES CXX_STANDARD 17)        
 target_link_libraries(CPMSol2Example sol2)
+

examples/sol2/main.cpp

@@ -1,17 +1,16 @@
-#include <cassert>
 #include <sol/sol.hpp>
+#include <cassert>
 
 struct vars {
-  int boop = 0;
+    int boop = 0;
 };
 
 int main() {
-  sol::state lua;
-  lua.open_libraries(sol::lib::base);
-  lua.new_usertype<vars>("vars", "boop", &vars::boop);
-  lua.script(
-      "beep = vars.new()\n"
-      "beep.boop = 1\n"
-      "print('beep boop')");
-  assert(lua.get<vars>("beep").boop == 1);
+    sol::state lua;
+    lua.open_libraries( sol::lib::base );
+    lua.new_usertype<vars>("vars", "boop", &vars::boop);
+    lua.script("beep = vars.new()\n"
+               "beep.boop = 1\n"
+               "print('beep boop')");
+    assert(lua.get<vars>("beep").boop == 1);
 }

examples/spdlog/CMakeLists.txt

@@ -1,15 +0,0 @@
-cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
-
-project(CPMSpdlogExample)
-
-# ---- Dependencies ----
-
-include(../../cmake/CPM.cmake)
-
-CPMAddPackage("gh:gabime/spdlog@1.8.2")
-
-# ---- Executable ----
-
-add_executable(CPMSpdlogExample main.cpp)
-target_compile_features(CPMSpdlogExample PRIVATE cxx_std_17)
-target_link_libraries(CPMSpdlogExample spdlog)

examples/spdlog/main.cpp

@@ -1,6 +0,0 @@
-#include <spdlog/spdlog.h>
-
-int main() {
-  spdlog::info("Hello, world!");
-  return 0;
-}

examples/yaml/CMakeLists.txt

@@ -6,10 +6,22 @@ project(CPMYamlExample)
 
 include(../../cmake/CPM.cmake)
 
-CPMAddPackage("gh:jbeder/yaml-cpp#yaml-cpp-0.6.3@0.6.3")
+CPMAddPackage(
+  NAME yaml-cpp
+  GIT_REPOSITORY https://github.com/jbeder/yaml-cpp.git
+  # 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 
+  OPTIONS
+    "YAML_CPP_BUILD_TESTS Off"
+    "YAML_CPP_BUILD_CONTRIB Off"
+    "YAML_CPP_BUILD_TOOLS Off"
+)
 
 # ---- Executable ----
 
-add_executable(CPMYamlExample main.cpp)
-target_compile_features(CPMYamlExample PRIVATE cxx_std_17)
+add_executable(CPMYamlExample "main.cpp")
+set_target_properties(CPMYamlExample PROPERTIES CXX_STANDARD 17)        
 target_link_libraries(CPMYamlExample yaml-cpp)
+

examples/yaml/main.cpp

@@ -1,8 +1,7 @@
 #include <yaml-cpp/yaml.h>
-
 #include <iostream>
 
-int main(int argc, char** argv) {
+int main(int argc, char ** argv){
   if (argc != 2) {
     std::cout << "usage: " << argv[0] << " <path to yaml file>" << std::endl;
     return 1;

test/CMakeLists.txt

@@ -8,8 +8,9 @@ enable_testing()
 
 foreach(test ${tests})
   message(STATUS "adding test: ${test}")
-  add_test(NAME ${test} COMMAND ${CMAKE_COMMAND} -DCPM_PATH=${CMAKE_CURRENT_SOURCE_DIR}/../cmake -P
-                                "${test}"
+  add_test(
+    NAME ${test} 
+    COMMAND ${CMAKE_COMMAND} -DCPM_PATH=${CMAKE_CURRENT_SOURCE_DIR}/../cmake -P "${test}"
   )
 endforeach()
 

test/integration/.gitignore

@@ -1,2 +0,0 @@
-# Use this to have a local integration test which is for personal experiments
-test_local.rb

test/integration/README.md

@@ -1,44 +0,0 @@
-# CPM.cmake Integration Tests
-
-The integration tests of CPM.cmake are written in Ruby. They use a custom integration test framework which extends the [Test::Unit](https://www.rubydoc.info/github/test-unit/test-unit/Test/Unit) library.
-
-They require Ruby 2.7.0 or later.
-
-## Running tests
-
-To run all tests from the repo root execute:
-
-```
-$ ruby test/integration/runner.rb
-```
-
-The runner will run all tests and generate a report of the exeuction.
-
-The current working directory doesn't matter. If you are in `<repo-root>/test/integration`, you can run simply `$ ruby runner.rb`.
-
-You can execute with `--help` (`$ ruby runner.rb --help`) to see various configuration options of the runner like running individual tests or test cases, or ones that match a regex.
-
-The tests themselves are situated in the Ruby scripts prefixed with `test_`. `<repo-root>/test/integration/test_*`. You can also run an individual test script. For example to only run the **basics** test case, you can execute `$ ruby test_basics.rb`
-
-The tests generate CMake scripts and execute CMake and build toolchains. By default they do this in a directory they generate in your temp path (`/tmp/cpm-test/` on Linux). You can configure the working directory of the tests with an environment variable `CPM_INTEGRATION_TEST_DIR`. For example `$ CPM_INTEGRATION_TEST_DIR=~/mycpmtest; ruby runner.rb`
-
-## Writing tests
-
-Writing tests makes use of the custom integration test framework in `lib.rb`. It is a relatively small extension of Ruby's Test::Unit library.
-
-### The Gist
-
-* Tests cases are Ruby scripts in this directory. The file names must be prefixed with `test_`
-* The script should `require_relative './lib'` to allow for individual execution (or else if will only be executable from the runner)
-* A test case file should contain a single class which inherits from `IntegrationTest`. It *can* contain multiple classes, but that's bad practice as it makes individual execution harder and implies a dependency between the classes.
-* There should be no dependency between the test scripts. Each should be executable individually and the order in which multiple ones are executed mustn't matter.
-* The class should contain methods, also prefixed with `test_` which will be executed by the framework. In most cases there would be a single test method per class.
-* In case there are multiple test methods, they will be executed in the order in which they are defined.
-* The test methods should contain assertions which check for the expected state of things at varous points of the test's execution.
-
-### More
-
-* [A basic tutorial on writing integration tests.](tutorial.md)
-* [A brief reference of the integration test framework](reference.md)
-* Make sure you're familiar with the [idiosyncrasies](idiosyncrasies.md) of writing integration tests
-* [Some tips and tricks](tips.md)

test/integration/idiosyncrasies.md

@@ -1,98 +0,0 @@
-# Notable Idiosyncrasies When Writing Integration Tests
-
-As an integration test framework based on a unit test framework the one created for CPM.cmake suffers from several idiosyncrasies. Make sure you familiarize yourself with them before writing integration tests.
-
-## No shared instance variables between methods
-
-The runner will create an instance of the test class for each test method. This means that instance variables defined in a test method, *will not* be visible in another. For example:
-
-```ruby
-class MyTest < IntegrationTest
-  def test_something
-    @x = 123
-    assert_equal 123, @x # Pass. @x is 123
-  end
-  def test_something_else
-    assert_equal 123, @x # Fail! @x would be nil here
-  end
-end
-```
-
-There are hacks around sharing Ruby state between methods, but we choose not to use them. If you want to initialize something for all test methods, use `setup`.
-
-```ruby
-class MyTest < IntegrationTest
-  def setup
-    @x = 123
-  end
-  def test_something
-    assert_equal 123, @x # Pass. @x is 123 thanks to setup
-  end
-  def test_something_else
-    assert_equal 123, @x # Pass. @x is 123 thanks to setup
-  end
-end
-```
-
-## `IntegrationTest` makes use of `Test::Unit::TestCase#cleanup`
-
-After each test method the `cleanup` method is called thanks to Test::Unit. If you require the use of `cleanup` in your own tests, make sure you call `super` to also run `IntegrationTest#cleanup`.
-
-```ruby
-class MyTest < IntegrationTest
-  def cleanup
-    super
-    my_cleanup
-  end
-  # ...
-end
-```
-
-## It's better to have assertions in test methods as opposed to helper methods
-
-Test::Unit will display a helpful message if an assertion has failed. It will also include the line of code in the test method which caused the failure. However if an assertion is not in the test method, it will display the line which calls the method in which it is. So, please try, to have most assertions in test methods (though we acknowledge that in certain cases this is not practical). For example, if you only require scopes, try using lambdas.
-
-Instead of this:
-
-```ruby
-class MyTest < IntegrationTest
-  def test_something
-    do_a
-    do_b
-    do_c
-  end
-  def do_a
-    # ...
-  end
-  def do_b
-    # ...
-    assert false # will display failed line as "do_b"
-  end
-  def do_c
-    # ...
-  end
-end
-```
-
-...write this:
-
-```ruby
-class MyTest < IntegrationTest
-  def test_something
-    do_a = -> {
-      # ...
-    }
-    do_b = -> {
-      # ...
-      assert false # will display failed line as "assert false"
-    }
-    do_c = -> {
-      # ...
-    }
-
-    do_a.()
-    do_b.()
-    do_c.()
-  end
-end
-```

test/integration/lib.rb

@@ -1,200 +0,0 @@
-require 'fileutils'
-require 'open3'
-require 'tmpdir'
-require 'test/unit'
-
-module TestLib
-  TMP_DIR = File.expand_path(ENV['CPM_INTEGRATION_TEST_DIR'] || File.join(Dir.tmpdir, 'cpm-test', Time.now.strftime('%Y_%m_%d-%H_%M_%S')))
-  CPM_PATH = File.expand_path('../../cmake/CPM.cmake', __dir__)
-
-  TEMPLATES_DIR = File.expand_path('templates', __dir__)
-
-  # Environment variables which are read by cpm
-  CPM_ENV = %w(
-    CPM_USE_LOCAL_PACKAGES
-    CPM_LOCAL_PACKAGES_ONLY
-    CPM_DOWNLOAD_ALL
-    CPM_DONT_UPDATE_MODULE_PATH
-    CPM_DONT_CREATE_PACKAGE_LOCK
-    CPM_INCLUDE_ALL_IN_PACKAGE_LOCK
-    CPM_USE_NAMED_CACHE_DIRECTORIES
-    CPM_SOURCE_CACHE
-  )
-  def self.clear_env
-    CPM_ENV.each { ENV[_1] = nil }
-  end
-end
-
-puts "Warning: test directory '#{TestLib::TMP_DIR}' already exists" if File.exist?(TestLib::TMP_DIR)
-raise "Cannot find 'CPM.cmake' at '#{TestLib::CPM_PATH}'" if !File.file?(TestLib::CPM_PATH)
-
-puts "Running CPM.cmake integration tests"
-puts "Temp directory: '#{TestLib::TMP_DIR}'"
-
-# Clean all CPM-related env vars
-TestLib.clear_env
-
-class Project
-  def initialize(src_dir, bin_dir)
-    @src_dir = src_dir
-    @bin_dir = bin_dir
-  end
-
-  attr :src_dir, :bin_dir
-
-  def create_file(target_path, text, args = {})
-    target_path = File.join(@src_dir, target_path)
-
-    # tweak args
-    args[:cpm_path] = TestLib::CPM_PATH if !args[:cpm_path]
-    args[:packages] = [args[:package]] if args[:package] # if args contain package, create the array
-    args[:packages] = args[:packages].join("\n") if args[:packages] # join all packages if any
-
-    File.write target_path, text % args
-  end
-
-  def create_file_from_template(target_path, source_path, args = {})
-    source_path = File.join(@src_dir, source_path)
-    raise "#{source_path} doesn't exist" if !File.file?(source_path)
-    src_text = File.read source_path
-    create_file target_path, src_text, args
-  end
-
-  # common function to create ./CMakeLists.txt from ./lists.in.cmake
-  def create_lists_from_default_template(args = {})
-    create_file_from_template 'CMakeLists.txt', 'lists.in.cmake', args
-  end
-
-  CommandResult = Struct.new :out, :err, :status
-  def configure(extra_args = '')
-    CommandResult.new *Open3.capture3("cmake -S #{@src_dir} -B #{@bin_dir} #{extra_args}")
-  end
-  def build(extra_args = '')
-    CommandResult.new *Open3.capture3("cmake --build #{@bin_dir} #{extra_args}")
-  end
-
-  class CMakeCache
-    class Entry
-      def initialize(val, type, advanced, desc)
-        @val = val
-        @type = type
-        @advanced = advanced
-        @desc = desc
-      end
-      attr :val, :type, :advanced, :desc
-      alias_method :advanced?, :advanced
-      def inspect
-        "(#{val.inspect} #{type}" + (advanced? ? ' ADVANCED)' : ')')
-      end
-    end
-
-    Package = Struct.new(:ver, :src_dir, :bin_dir)
-
-    def self.from_dir(dir)
-      entries = {}
-      cur_desc = ''
-      file = File.join(dir, 'CMakeCache.txt')
-      return nil if !File.file?(file)
-      File.readlines(file).each { |line|
-        line.strip!
-        next if line.empty?
-        next if line.start_with? '#' # comment
-        if line.start_with? '//'
-          cur_desc += line[2..]
-        else
-          m = /(.+?)(-ADVANCED)?:([A-Z]+)=(.*)/.match(line)
-          raise "Error parsing '#{line}' in #{file}" if !m
-          entries[m[1]] = Entry.new(m[4], m[3], !!m[2], cur_desc)
-          cur_desc = ''
-        end
-      }
-      CMakeCache.new entries
-    end
-
-    def initialize(entries)
-      @entries = entries
-
-      package_list = self['CPM_PACKAGES']
-      @packages = if package_list
-        # collect package data
-        @packages = package_list.split(';').map { |name|
-          [name, Package.new(
-            self["CPM_PACKAGE_#{name}_VERSION"],
-            self["CPM_PACKAGE_#{name}_SOURCE_DIR"],
-            self["CPM_PACKAGE_#{name}_BINARY_DIR"]
-          )]
-        }.to_h
-      else
-        {}
-      end
-    end
-
-    attr :entries, :packages
-
-    def [](key)
-      e = @entries[key]
-      return nil if !e
-      e.val
-    end
-  end
-  def read_cache
-    CMakeCache.from_dir @bin_dir
-  end
-end
-
-class IntegrationTest < Test::Unit::TestCase
-  self.test_order = :defined # run tests in order of defintion (as opposed to alphabetical)
-
-  def cleanup
-    # Clear cpm-related env vars which may have been set by the test
-    TestLib.clear_env
-  end
-
-  # extra assertions
-
-  def assert_success(res)
-    msg = build_message(nil, "command status was expected to be a success, but failed with code <?> and STDERR:\n\n#{res.err}", res.status.to_i)
-    assert_block(msg) { res.status.success? }
-  end
-
-  def assert_same_path(a, b)
-    msg = build_message(nil, "<?> expected but was\n<?>", a, b)
-    assert_block(msg) { File.identical? a, b }
-  end
-
-  # utils
-  class << self
-    def startup
-      @@test_dir = File.join(TestLib::TMP_DIR, self.name.
-        # to-underscore conversion from Rails
-        gsub(/::/, '/').
-        gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-        gsub(/([a-z\d])([A-Z])/,'\1_\2').
-        tr("-", "_").
-        downcase
-      )
-    end
-  end
-
-  def cur_test_dir
-    @@test_dir
-  end
-
-  def make_project(template_dir = nil)
-    test_name = local_name
-    test_name = test_name[5..] if test_name.start_with?('test_')
-
-    base = File.join(cur_test_dir, test_name)
-    src_dir = base + '-src'
-
-    FileUtils.mkdir_p src_dir
-
-    if template_dir
-      template_dir = File.join(TestLib::TEMPLATES_DIR, template_dir)
-      raise "#{template_dir} is not a directory" if !File.directory?(template_dir)
-      FileUtils.copy_entry template_dir, src_dir
-    end
-
-    Project.new src_dir, base + '-bin'
-  end
-end

test/integration/reference.md

@@ -1,65 +0,0 @@
-# Integration Test Framework Refernce
-
-## `TestLib`
-
-A module for the framework. Provides global data and functionality. For ease of use the utility classes are *not* in this module.
-
-Provides:
-
-* `TMP_DIR` - the temporary directory for the current test run
-* `CPM_PATH` - path to CPM.cmake. The thing that is being tested
-* `TEMPLATES_DIR` - path to integration test templates
-* `CPM_ENV` - an array of the names of all environment variables, which CPM.cmake may read
-* `.clear_env` - a function to clear all aforementioned environment variables
-
-## `Project`
-
-A helper class to manage a CMake project.
-
-Provides:
-
-* `#initialize(src_dir, bin_dir)` - create a project with a given source and binary directory
-* `#src_dir`, `#bin_dir` - get project directories
-* `#create_file(target_path, text, args = {})` - create a file in the project's source directory with a given test. The `args` hash is used to interpolate markup in the text string.
-    * Will set `:cpm_path` in `args` to `TestLib::CPM_PATH` if not already present.
-    * If `:package` is present it will be added to the array `:packages`
-    * Will convert `:packages` form an array to a string
-* `#create_file_from_template(target_path, source_path, args = {})` - create a file in the project source directory, based on another file in the project source directory. The contents of the file at `source_path` will be read and used in `create_file`
-* `#create_lists_from_default_template(args = {})` - same as `create_file_from_template('CMakeLists.txt', 'lists.in.cmake', args)`
-* `::CommandResult` - a struct of:
-    * `out` - the standard output from a command execution
-    * `err` - the standard error output from the execution
-    * `status` - the [`Process::Status`](https://ruby-doc.org/core-2.7.0/Process/Status.html) of the execution
-* `#configure(extra_args = '') => CommandResult` - configure the project with optional extra args to CMake
-* `#build(extra_args = '') => CommandResult` - build the project with optional extra args to CMake
-* `::CMakeCache` - a helper class with the contents of a CMakeCache.txt. Provides:
-    * `::Entry` - a CMake cache entry of:
-        * `val` - the value as string
-        * `type` - the type as string
-        * `advanced?` - whether the entry is an advanced option
-        * `desc` - the description of the entry (can be an empty string)
-    * `::Package` - the CMake cache for a CPM.cmake package. A struct of:
-        * `ver` - the version as string
-        * `src_dir`, `bin_dir` - the source and binary directories of the package
-    * `.from_dir(dir)` - create an instance of `CMakeCache` from `<dir>/CMakeLists.txt`
-    * `#initialize(entries)` - create a cache from a hash of entries by name. Will populate packages.
-    * `#entries => {String => Entry}` - the entries of the cache
-    * `#packages => {String => Package}` - CPM.cmake packages by name found in the cache
-    * `#[](key) => String` - an entry value from an entry name. Created because the value is expected to be needed much more frequently than the entire entry data. To get a full entry use `cache.entries['name']`.
-* `read_cache => CMakeCache` - reads the CMake cache in the binary directory of the project and returns it as a `CMakeCache` instance
-
-## `IntegrationTest`
-
-The class which must be a parent of all integration test case classes. It itself extends `Test::Unit::TestCase` with:
-
-### Assertions
-
-* `assert_success(res)` - assert that an instance of `Project::CommandResult` is a success
-* `assert_same_path(a, b)` - assert that two strings represent the same path. For example on Windows `c:\foo` and `C:\Foo` do.
-
-### Utils
-
-* `cur_test_dir` - the directory of the current test case. A subdirectory of `TestLib::TMP_DIR`
-* `make_project(template_dir = nil)` - create a project from a test method. Will create a the project's source and binary directories as subdirectories of `cur_test_dir`.
-    * Optionally work with a template directory, in which case it will copy the contents of the template directory (one from `templates`) in the project's source directory.
-

test/integration/runner.rb

@@ -1,4 +0,0 @@
-require_relative './lib'
-
-exit Test::Unit::AutoRunner::run(true, __dir__)
-

test/integration/templates/no-deps/lists.in.cmake

@@ -1,7 +0,0 @@
-cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
-
-project(no-deps)
-
-include("%{cpm_path}")
-
-add_executable(no-deps main.c)

test/integration/templates/no-deps/main.c

@@ -1,6 +0,0 @@
-#include <stdio.h>
-
-int main() {
-  puts("Hello");
-  return 0;
-}

test/integration/templates/using-adder/lists.in.cmake

@@ -1,13 +0,0 @@
-cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
-
-project(using-adder)
-
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-
-include("%{cpm_path}")
-
-%{packages}
-
-add_executable(using-adder using-adder.cpp)
-
-target_link_libraries(using-adder adder)

test/integration/templates/using-adder/using-adder.cpp

@@ -1,8 +0,0 @@
-#include <adder/adder.hpp>
-#include <cstdio>
-
-int main() {
-  int sum = adder::add(5, 3);
-  std::printf("%d\n", sum);
-  return 0;
-}

test/integration/templates/using-fibadder/lists.in.cmake

@@ -1,13 +0,0 @@
-cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
-
-project(using-fibadder)
-
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-
-include("%{cpm_path}")
-
-%{packages}
-
-add_executable(using-fibadder using-fibadder.cpp)
-
-target_link_libraries(using-fibadder fibadder)

test/integration/templates/using-fibadder/using-fibadder.cpp

@@ -1,8 +0,0 @@
-#include <cstdio>
-#include <fibadder/fibadder.hpp>
-
-int main() {
-  int sum = fibadder::fibadd(6, 7);
-  std::printf("%d\n", sum);
-  return 0;
-}

test/integration/test_basics.rb

@@ -1,56 +0,0 @@
-require_relative './lib'
-
-# Tests of cpm caches and vars when no packages are used
-
-class Basics < IntegrationTest
-  # Test cpm caches with no cpm-related env vars
-  def test_cpm_default
-    prj = make_project 'no-deps'
-    prj.create_lists_from_default_template
-    assert_success prj.configure
-
-    @cache = prj.read_cache
-
-    assert_empty @cache.packages
-
-    assert_same_path TestLib::CPM_PATH, check_and_get('CPM_FILE')
-    assert_same_path File.dirname(TestLib::CPM_PATH), check_and_get('CPM_DIRECTORY')
-
-    assert_equal 'OFF', check_and_get('CPM_DRY_RUN')
-    assert_equal 'CPM:', check_and_get('CPM_INDENT')
-    assert_equal '1.0.0-development-version', check_and_get('CPM_VERSION')
-
-    assert_equal 'OFF', check_and_get('CPM_SOURCE_CACHE', 'PATH')
-    assert_equal 'OFF', check_and_get('CPM_DOWNLOAD_ALL', 'BOOL')
-    assert_equal 'OFF', check_and_get('CPM_LOCAL_PACKAGES_ONLY', 'BOOL')
-    assert_equal 'OFF', check_and_get('CPM_USE_LOCAL_PACKAGES', 'BOOL')
-    assert_equal 'OFF', check_and_get('CPM_USE_NAMED_CACHE_DIRECTORIES', 'BOOL')
-
-    assert_equal 'OFF', check_and_get('CPM_DONT_CREATE_PACKAGE_LOCK', 'BOOL')
-    assert_equal 'OFF', check_and_get('CPM_INCLUDE_ALL_IN_PACKAGE_LOCK', 'BOOL')
-    assert_same_path File.join(prj.bin_dir, 'cpm-package-lock.cmake'), check_and_get('CPM_PACKAGE_LOCK_FILE')
-
-    assert_equal 'OFF', check_and_get('CPM_DONT_UPDATE_MODULE_PATH', 'BOOL')
-    assert_same_path File.join(prj.bin_dir, 'CPM_modules'), check_and_get('CPM_MODULE_PATH')
-  end
-
-  # Test when env CPM_SOURCE_CACHE is set
-  def test_env_cpm_source_cache
-    ENV['CPM_SOURCE_CACHE'] = cur_test_dir
-
-    prj = make_project 'no-deps'
-    prj.create_lists_from_default_template
-    assert_success prj.configure
-
-    @cache = prj.read_cache
-
-    assert_equal cur_test_dir, check_and_get('CPM_SOURCE_CACHE', 'PATH')
-  end
-
-  def check_and_get(key, type = 'INTERNAL')
-    e = @cache.entries[key]
-    assert_not_nil e, key
-    assert_equal type, e.type, key
-    e.val
-  end
-end

test/integration/test_simple.rb

@@ -1,91 +0,0 @@
-require_relative './lib'
-
-class Simple < IntegrationTest
-  ADDER_PACKAGE_NAME = 'testpack-adder'
-
-  def test_update_single_package
-    prj = make_project 'using-adder'
-    adder_cache0 = nil
-    adder_ver_file = nil
-
-    create_with_commit_sha = -> {
-      prj.create_lists_from_default_template package:
-        'CPMAddPackage("gh:cpm-cmake/testpack-adder#cad1cd4b4cdf957c5b59e30bc9a1dd200dbfc716")'
-      assert_success prj.configure
-
-      cache = prj.read_cache
-      assert_equal 1, cache.packages.size
-
-      adder_cache = cache.packages[ADDER_PACKAGE_NAME]
-      assert_not_nil adder_cache
-      assert_equal '0', adder_cache.ver
-      assert File.directory? adder_cache.src_dir
-      assert File.directory? adder_cache.bin_dir
-
-      adder_ver_file = File.join(adder_cache.src_dir, 'version')
-      assert File.file? adder_ver_file
-      assert_equal 'initial', File.read(adder_ver_file).strip
-
-      # calculated adder values
-      assert_equal 'ON', cache['ADDER_BUILD_EXAMPLES']
-      assert_equal 'ON', cache['ADDER_BUILD_TESTS']
-      assert_equal adder_cache.src_dir, cache['adder_SOURCE_DIR']
-      assert_equal adder_cache.bin_dir, cache['adder_BINARY_DIR']
-
-      # store for future comparisons
-      adder_cache0 = adder_cache
-    }
-    update_to_version_1 = -> {
-      prj.create_lists_from_default_template package:
-        'CPMAddPackage("gh:cpm-cmake/testpack-adder@1.0.0")'
-      assert_success prj.configure
-
-      cache = prj.read_cache
-      assert_equal 1, cache.packages.size
-
-      adder_cache = cache.packages[ADDER_PACKAGE_NAME]
-      assert_not_nil adder_cache
-      assert_equal '1.0.0', adder_cache.ver
-
-      # dirs shouldn't have changed
-      assert_equal adder_cache0.src_dir, adder_cache.src_dir
-      assert_equal adder_cache0.bin_dir, adder_cache.bin_dir
-
-      assert_equal '1.0.0', File.read(adder_ver_file).strip
-    }
-    update_with_option_off_and_build = -> {
-      prj.create_lists_from_default_template package: <<~PACK
-        CPMAddPackage(
-          NAME testpack-adder
-          GITHUB_REPOSITORY cpm-cmake/testpack-adder
-          VERSION 1.0.0
-          OPTIONS "ADDER_BUILD_TESTS OFF"
-        )
-      PACK
-      assert_success prj.configure
-      assert_success prj.build
-
-      exe_dir = File.join(prj.bin_dir, 'bin')
-      assert File.directory? exe_dir
-
-      exes = Dir[exe_dir + '/**/*'].filter {
-        # on multi-configuration generators (like Visual Studio) the executables will be in bin/<Config>
-        # also filter-out other articacts like .pdb or .dsym
-        !File.directory?(_1) && File.stat(_1).executable?
-      }.map {
-        # remove .exe extension if any (there will be one on Windows)
-        File.basename(_1, '.exe')
-      }.sort
-
-      # we should end up with two executables
-      # * simple - the simple example from adder
-      # * using-adder - for this project
-      # ...and notably no test for adder, which must be disabled from the option override from above
-      assert_equal ['simple', 'using-adder'], exes
-    }
-
-    create_with_commit_sha.()
-    update_to_version_1.()
-    update_with_option_off_and_build.()
-  end
-end

test/integration/test_source_cache.rb

@@ -1,80 +0,0 @@
-require_relative './lib'
-
-# Tests with source cache
-
-class SourceCache < IntegrationTest
-  def setup
-    @cache_dir = File.join(cur_test_dir, 'cpmcache')
-    ENV['CPM_SOURCE_CACHE'] = @cache_dir
-  end
-
-  def test_add_remove_dependency
-    prj = make_project 'using-fibadder'
-
-    ###################################
-    # create
-    prj.create_lists_from_default_template package: 'CPMAddPackage("gh:cpm-cmake/testpack-fibadder@1.0.0")'
-    assert_success prj.configure
-
-    @cache = prj.read_cache
-
-    # fibadder - adder
-    #          \ fibonacci - Format
-    assert_equal 4, @cache.packages.size
-
-    check_package_cache 'testpack-fibadder', '1.0.0', '6a17d24c95c44a169ff8ba173f52876a2ba3d137'
-    check_package_cache 'testpack-adder', '1.0.0', '1a4c153849d8e0cf9a3a245e5f6ab6e4722d8995'
-    check_package_cache 'testpack-fibonacci', '2.0', '332c789cb09b8c2f92342dfb874c82bec643daf6'
-    check_package_cache 'Format.cmake', '1.0', 'c5897bd28c5032d45f7f669c8fb470790d2ae156'
-
-    ###################################
-    # add one package with a newer version
-    prj.create_lists_from_default_template packages: [
-      'CPMAddPackage("gh:cpm-cmake/testpack-adder@1.0.1")',
-      'CPMAddPackage("gh:cpm-cmake/testpack-fibadder@1.0.0")',
-    ]
-    assert_success prj.configure
-
-    @cache = prj.read_cache
-    assert_equal 4, @cache.packages.size
-
-    check_package_cache 'testpack-fibadder', '1.0.0', '6a17d24c95c44a169ff8ba173f52876a2ba3d137'
-    check_package_cache 'testpack-adder', '1.0.1', '84eb33c1b8db880083cefc2adf4dc3f04778cd44'
-    check_package_cache 'testpack-fibonacci', '2.0', '332c789cb09b8c2f92342dfb874c82bec643daf6'
-    check_package_cache 'Format.cmake', '1.0', 'c5897bd28c5032d45f7f669c8fb470790d2ae156'
-  end
-
-  def test_second_project
-    prj = make_project 'using-fibadder'
-    prj.create_lists_from_default_template package: 'CPMAddPackage("gh:cpm-cmake/testpack-fibadder@1.1.0")'
-    assert_success prj.configure
-
-    @cache = prj.read_cache
-
-    # fibadder - adder
-    #          \ fibonacci - Format
-    assert_equal 4, @cache.packages.size
-
-    check_package_cache 'testpack-fibadder', '1.1.0', '603d79d88d7230cc749460a0f476df862aa70ead'
-    check_package_cache 'testpack-adder', '1.0.1', '84eb33c1b8db880083cefc2adf4dc3f04778cd44'
-    check_package_cache 'testpack-fibonacci', '2.0', '332c789cb09b8c2f92342dfb874c82bec643daf6'
-    check_package_cache 'Format.cmake', '1.0', 'c5897bd28c5032d45f7f669c8fb470790d2ae156'
-  end
-
-  def test_cache_dir_contents
-    num_subdirs = -> (name) { Dir["#{File.join(@cache_dir, name.downcase)}/*/"].size }
-    assert_equal 2, num_subdirs.('testpack-fibadder')
-    assert_equal 2, num_subdirs.('testpack-adder')
-    assert_equal 1, num_subdirs.('testpack-fibonacci')
-    assert_equal 1, num_subdirs.('Format.cmake')
-  end
-
-  def check_package_cache(name, ver, dir_sha1)
-    package = @cache.packages[name]
-    assert_not_nil package, name
-    assert_equal ver, package.ver
-    expected_parent_dir = File.join(@cache_dir, name.downcase)
-    assert package.src_dir.start_with?(expected_parent_dir), "#{package.src_dir} must be in #{expected_parent_dir}"
-    assert_equal dir_sha1, File.basename(package.src_dir)
-  end
-end

test/integration/tips.md

@@ -1,35 +0,0 @@
-# Tips and Tricks
-
-## Playing and experimenting
-
-Create a file called `test_local.rb` in this directory to have an integration test which is for your personal experiments and just playing with the integration test framework. `test_local.rb` is gitignored.
-
-## Speeding-up development
-
-Running an integration test requires configuring directories with CMake which can be quite slow. To speed-up development of integration tests consider doing the following steps:
-
-**Work with standalone tests**
-
-Instead of starting the runner, run just your integration test (`$ ruby test_your_test.rb`). This won't burden the execution with the others.
-
-**Export the environment variable `CPM_INTEGRATION_TEST_DIR` to some local directory**
-
-By default the framework generates a new temporary directory for each test run. If you override the temp directory to a specific one, rerunning the tests will work with the binary directories from the previous run and will improve the performance considerably.
-
-*NOTE HOWEVER* that in certain cases this may not be an option. Some tests might assert that certain artifacts in the temporary directory are missing but upon rerunning in an existing directory they will be there causing the test to fail.
-
-*ALSO NOTE* that this may silently affect reruns based on CMake caches from previous runs. If your test fails in peculiar ways on reruns, try a clean run. Always do a clean run before declaring a test a success.
-
-**Set `CPM_SOURCE_CACHE` even if the test doesn't require it**
-
-This is not a option for tests which explicitly check that there is no source cache. However certain tests may be indiferent to this. For such cases in development, you can add a setup function in the lines of:
-
-```ruby
-def setup
-  ENV['CPM_SOURCE_CACHE'] = '/home/myself/.testcpmcache'
-end
-```
-
-Then the packages from your test will be cached and not redownloaded every time which is a dramatic improvement in performance.
-
-*NOTE HOWEVER* that this may introduce subtle bugs. Always test without this dev-only addition, before declaring a test a success.

test/integration/tutorial.md

@@ -1,69 +0,0 @@
-# Integration Test Tutorial
-
-Let's create an integration test which checks that CPM.cmake can make a specific package available.
-
-First we do some boilerplate.
-
-```ruby
-require_relative './lib'
-
-class MyTest < IntegrationTest
-  # test that CPM.cmake can make https://github.com/cpm-cmake/testpack-adder/ available as a package
-  def test_make_adder_available
-  end
-end
-```
-
-Now we have our test case class, and the single test method that we will require. Let's focus on the method's contents. The integration test framework provides us with a helper class, `Project`, which can be used for this scenario. A project has an assoiciated pair of source and binary directories in the temporary directory and it provides methods to work with them.
-
-We start by creating the project:
-
-```ruby
-prj = make_project
-```
-
-`make_project` is method of IntegrationTest which generates a source and a binary directory for it based on the name of our test class and test method. The project doesn't contain anything yet, so let's create some source files:
-
-```ruby
-prj.create_file 'main.cpp', <<~SRC
-  #include <iostream>
-  #include <adder/adder.hpp>
-  int main() {
-      std::cout << adder::add(1, 2) << '\\n';
-      return 0;
-  }
-SRC
-prj.create_file 'CMakeLists.txt', <<~SRC
-  cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
-  project(using-adder)
-  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-  include("%{cpm_path}")
-  CPMAddPackage("gh:cpm-cmake/testpack-adder@1.0.0")
-  add_executable(using-adder main.cpp)
-  target_link_libraries(using-adder adder)
-SRC
-```
-
-Note the line `include("%{cpm_path}")` when creating `CMakeLists.txt`. It contains a markup `%{cpm_path}`. `Project#create_file` will see such markups and substitute them with the appropriate values (in this case the path to CPM.cmake).
-
-Now that we have the two files we need it's time we configure our project. We can use the opportunity to assert that the configure is successful as we expect it to be.
-
-```ruby
-assert_success prj.configure
-```
-
-Now we can read the generated `CMakeCache.txt` and assert that certain values we expect are inside. `Project` provides a method for that: `read_cache`. It will return an instance of `Project::CMakeCache` which contains the data from the cache and provides additional helper functionalities. One of them is `packages`, which is a hash of the CPM.cmake packages in the cache with their versions, binary, source directories. So let's get the cache and assert that there is only one CPM.cmake package inside ant it has the version we expect.
-
-```ruby
-cache = prj.read_cache
-assert_equal 1, cache.packages.size
-assert_equal '1.0.0', cache.packages['testpack-adder'].ver
-```
-
-Finally let's assert that the project can be built. This would mean that CPM.cmake has made the package available to our test project and that it has the appropriate include directories and link libraries to make an executable out of `main.cpp`.
-
-```ruby
-assert_success prj.build
-```
-
-You can see the entire code for this tutorial in [tutorial.rb](tutorial.rb) in this directory.

test/integration/tutorial.rb

@@ -1,37 +0,0 @@
-# This file is intentionally not prefixed with test_
-# It is a tutorial for making integration tests and is not to be run from the runner
-require_relative './lib'
-
-class Tutorial < IntegrationTest
-  # test that CPM.cmake can make https://github.com/cpm-cmake/testpack-adder/ available as a package
-  def test_make_adder_available
-    prj = make_project
-
-    prj.create_file 'main.cpp', <<~SRC
-      #include <iostream>
-      #include <adder/adder.hpp>
-      int main() {
-          std::cout << adder::add(1, 2) << '\\n';
-          return 0;
-      }
-    SRC
-
-    prj.create_file 'CMakeLists.txt', <<~SRC
-      cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
-      project(using-adder)
-      set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-      include("%{cpm_path}")
-      CPMAddPackage("gh:cpm-cmake/testpack-adder@1.0.0")
-      add_executable(using-adder main.cpp)
-      target_link_libraries(using-adder adder)
-    SRC
-
-    assert_success prj.configure
-
-    cache = prj.read_cache
-    assert_equal 1, cache.packages.size
-    assert_equal '1.0.0', cache.packages['testpack-adder'].ver
-
-    assert_success prj.build
-  end
-end

test/style/CMakeLists.txt

@@ -1,14 +0,0 @@
-cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
-
-project(CPMStyleCheck)
-
-include(${CMAKE_CURRENT_LIST_DIR}/../../cmake/CPM.cmake)
-
-CPMAddPackage(
-  NAME Format.cmake
-  VERSION 1.7.3
-  GITHUB_REPOSITORY TheLartians/Format.cmake
-  # We exclude cmake files from integration tests as they contain invalid lines of code which are
-  # used by the integration test scripts
-  OPTIONS "CMAKE_FORMAT_EXCLUDE integration/templates"
-)

test/unit/broken_dependency/.gitignore

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

test/unit/broken_dependency/CMakeLists.txt.in

@@ -1,13 +0,0 @@
-cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
-
-project(CPMTest)
-
-# ---- Dependencies ----
-
-include(@CPM_PATH@/CPM.cmake)
-
-CPMAddPackage(
-  NAME BrokenDependency
-  SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependency
-  EXCLUDE_FROM_ALL @EXCLUDE_FROM_ALL@
-)

test/unit/broken_dependency/dependency/CMakeLists.txt

@@ -1,3 +0,0 @@
-project(BrokenDependency)
-
-add_custom_target(error ALL ${CMAKE_COMMAND} -E false)

test/unit/cache.cmake

@@ -8,8 +8,8 @@ set(TEST_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/remote_dependency)
 
 function(clear_cache)
   message(STATUS "clearing CPM cache")
-  file(REMOVE_RECURSE ${CPM_SOURCE_CACHE_DIR})
-  assert_not_exists("${CPM_SOURCE_CACHE_DIR}")
+  FILE(REMOVE_RECURSE ${CPM_SOURCE_CACHE_DIR})
+  ASSERT_NOT_EXISTS("${CPM_SOURCE_CACHE_DIR}")
 endfunction()
 
 function(update_cmake_lists)
@@ -22,92 +22,100 @@ endfunction()
 
 function(reset_test)
   clear_cache()
-  file(REMOVE_RECURSE ${TEST_BUILD_DIR})
+  FILE(REMOVE_RECURSE ${TEST_BUILD_DIR})
   update_cmake_lists()
 endfunction()
 
 set(FIBONACCI_VERSION 1.0)
 
-# Read CPM_SOURCE_CACHE from arguments
+## Read CPM_SOURCE_CACHE from arguments
 
 reset_test()
 
 execute_process(
-  COMMAND ${CMAKE_COMMAND} "-S${CMAKE_CURRENT_LIST_DIR}/remote_dependency" "-B${TEST_BUILD_DIR}"
-          "-DCPM_SOURCE_CACHE=${CPM_SOURCE_CACHE_DIR}" RESULT_VARIABLE ret
+  COMMAND 
+  ${CMAKE_COMMAND} "-H${CMAKE_CURRENT_LIST_DIR}/remote_dependency" "-B${TEST_BUILD_DIR}" "-DCPM_SOURCE_CACHE=${CPM_SOURCE_CACHE_DIR}"
+  RESULT_VARIABLE ret
 )
 
-assert_equal(${ret} "0")
-assert_exists("${CPM_SOURCE_CACHE_DIR}/fibonacci")
+ASSERT_EQUAL(${ret} "0")
+ASSERT_EXISTS("${CPM_SOURCE_CACHE_DIR}/fibonacci")
 
-file(GLOB FIBONACCI_VERSIONs "${CPM_SOURCE_CACHE_DIR}/fibonacci/*")
+FILE(GLOB FIBONACCI_VERSIONs "${CPM_SOURCE_CACHE_DIR}/fibonacci/*")
 list(LENGTH FIBONACCI_VERSIONs FIBONACCI_VERSION_count)
-assert_equal(${FIBONACCI_VERSION_count} "1")
+ASSERT_EQUAL(${FIBONACCI_VERSION_count} "1")
 
-file(GLOB fibonacci_versions "${CPM_SOURCE_CACHE_DIR}/fibonacci/*")
+FILE(GLOB fibonacci_versions "${CPM_SOURCE_CACHE_DIR}/fibonacci/*")
 list(LENGTH fibonacci_versions fibonacci_version_count)
-assert_equal(${fibonacci_version_count} "1")
+ASSERT_EQUAL(${fibonacci_version_count} "1")
 
-# Update dependency and keep CPM_SOURCE_CACHE
+## 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)
+execute_process(
+  COMMAND 
+  ${CMAKE_COMMAND} ${TEST_BUILD_DIR}
+  RESULT_VARIABLE ret
+)
 
-assert_equal(${ret} "0")
+ASSERT_EQUAL(${ret} "0")
 
-file(GLOB FIBONACCI_VERSIONs "${CPM_SOURCE_CACHE_DIR}/fibonacci/*")
+FILE(GLOB FIBONACCI_VERSIONs "${CPM_SOURCE_CACHE_DIR}/fibonacci/*")
 list(LENGTH FIBONACCI_VERSIONs FIBONACCI_VERSION_count)
-assert_equal(${FIBONACCI_VERSION_count} "2")
+ASSERT_EQUAL(${FIBONACCI_VERSION_count} "2")
 
-# Clear cache and update
+## Clear cache and update
 
 clear_cache()
 
-execute_process(COMMAND ${CMAKE_COMMAND} ${TEST_BUILD_DIR} RESULT_VARIABLE ret)
+execute_process(
+  COMMAND 
+  ${CMAKE_COMMAND} ${TEST_BUILD_DIR}
+  RESULT_VARIABLE ret
+)
 
-assert_equal(${ret} "0")
-assert_exists("${CPM_SOURCE_CACHE_DIR}/fibonacci")
+ASSERT_EQUAL(${ret} "0")
+ASSERT_EXISTS("${CPM_SOURCE_CACHE_DIR}/fibonacci")
 
-# Read CPM_SOURCE_CACHE from environment
+## Read CPM_SOURCE_CACHE from environment
 
 reset_test()
 
 execute_process(
-  COMMAND ${CMAKE_COMMAND} -E env "CPM_SOURCE_CACHE=${CPM_SOURCE_CACHE_DIR}" ${CMAKE_COMMAND}
-          "-S${CMAKE_CURRENT_LIST_DIR}/remote_dependency" "-B${TEST_BUILD_DIR}" RESULT_VARIABLE ret
-)
-
-assert_equal(${ret} "0")
-assert_exists("${CPM_SOURCE_CACHE_DIR}/fibonacci")
-
-# Reuse cached packages for other build
-
-execute_process(
-  COMMAND ${CMAKE_COMMAND} -E env "CPM_SOURCE_CACHE=${CPM_SOURCE_CACHE_DIR}" ${CMAKE_COMMAND}
-          "-S${CMAKE_CURRENT_LIST_DIR}/remote_dependency" "-B${TEST_BUILD_DIR}-2"
+  COMMAND 
+  ${CMAKE_COMMAND} -E env "CPM_SOURCE_CACHE=${CPM_SOURCE_CACHE_DIR}" ${CMAKE_COMMAND} "-H${CMAKE_CURRENT_LIST_DIR}/remote_dependency" "-B${TEST_BUILD_DIR}"
   RESULT_VARIABLE ret
 )
 
-assert_equal(${ret} "0")
+ASSERT_EQUAL(${ret} "0")
+ASSERT_EXISTS("${CPM_SOURCE_CACHE_DIR}/fibonacci")
 
-# Overwrite CPM_SOURCE_CACHE with argument
+## 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}/remote_dependency" "-B${TEST_BUILD_DIR}-2"
+  RESULT_VARIABLE ret
+)
+
+ASSERT_EQUAL(${ret} "0")
+
+## 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}
-    "-S${CMAKE_CURRENT_LIST_DIR}/remote_dependency" "-B${TEST_BUILD_DIR}"
-    "-DCPM_SOURCE_CACHE=${CPM_SOURCE_CACHE_DIR}"
+  COMMAND 
+  ${CMAKE_COMMAND} -E env "CPM_SOURCE_CACHE=${CMAKE_CURRENT_BINARY_DIR}/junk" ${CMAKE_COMMAND} "-H${CMAKE_CURRENT_LIST_DIR}/remote_dependency" "-B${TEST_BUILD_DIR}" "-DCPM_SOURCE_CACHE=${CPM_SOURCE_CACHE_DIR}"
   RESULT_VARIABLE ret
 )
 
-assert_equal(${ret} "0")
-assert_exists("${CPM_SOURCE_CACHE_DIR}/fibonacci")
+ASSERT_EQUAL(${ret} "0")
+ASSERT_EXISTS("${CPM_SOURCE_CACHE_DIR}/fibonacci")
 
-# Use NO_CACHE option
+## Use NO_CACHE option
 
 set(FIBONACCI_PACKAGE_ARGS "NO_CACHE YES")
 set(FIBONACCI_VERSION 1.0)
@@ -115,23 +123,25 @@ update_cmake_lists()
 reset_test()
 
 execute_process(
-  COMMAND ${CMAKE_COMMAND} -E env "CPM_SOURCE_CACHE=${CPM_SOURCE_CACHE_DIR}" ${CMAKE_COMMAND}
-          "-S${CMAKE_CURRENT_LIST_DIR}/remote_dependency" "-B${TEST_BUILD_DIR}" RESULT_VARIABLE ret
+  COMMAND 
+  ${CMAKE_COMMAND} -E env "CPM_SOURCE_CACHE=${CPM_SOURCE_CACHE_DIR}" ${CMAKE_COMMAND} "-H${CMAKE_CURRENT_LIST_DIR}/remote_dependency" "-B${TEST_BUILD_DIR}"
+  RESULT_VARIABLE ret
 )
 
-assert_equal(${ret} "0")
-assert_not_exists("${CPM_SOURCE_CACHE_DIR}/fibonacci")
+ASSERT_EQUAL(${ret} "0")
+ASSERT_NOT_EXISTS("${CPM_SOURCE_CACHE_DIR}/fibonacci")
 
-# Use commit hash after version
+## Use commit hash after version
 
 set(FIBONACCI_PACKAGE_ARGS "NO_CACHE YES GIT_TAG e9ebf168ca0fffaa4ef8c6fefc6346aaa22f6ed5")
 set(FIBONACCI_VERSION 1.1)
 update_cmake_lists()
 
 execute_process(
-  COMMAND ${CMAKE_COMMAND} -E env "CPM_SOURCE_CACHE=${CPM_SOURCE_CACHE_DIR}" ${CMAKE_COMMAND}
-          "-S${CMAKE_CURRENT_LIST_DIR}/remote_dependency" "-B${TEST_BUILD_DIR}" RESULT_VARIABLE ret
+  COMMAND 
+  ${CMAKE_COMMAND} -E env "CPM_SOURCE_CACHE=${CPM_SOURCE_CACHE_DIR}" ${CMAKE_COMMAND} "-H${CMAKE_CURRENT_LIST_DIR}/remote_dependency" "-B${TEST_BUILD_DIR}"
+  RESULT_VARIABLE ret
 )
 
-assert_equal(${ret} "0")
-assert_not_exists("${CPM_SOURCE_CACHE_DIR}/fibonacci")
+ASSERT_EQUAL(${ret} "0")
+ASSERT_NOT_EXISTS("${CPM_SOURCE_CACHE_DIR}/fibonacci")

test/unit/dependency_properties.cmake

@@ -5,19 +5,31 @@ include(${CPM_PATH}/testing.cmake)
 
 set(CPM_DRY_RUN ON)
 
-CPMAddPackage(NAME A GIT_TAG 1.2.3)
+CPMAddPackage(
+  NAME A
+  GIT_TAG 1.2.3
+)
 
-CPMAddPackage(NAME A VERSION 1.2.3)
+CPMAddPackage(
+  NAME A
+  VERSION 1.2.3
+)
 
 CPMGetPackageVersion(A VERSION)
-assert_equal(${VERSION} "1.2.3")
+ASSERT_EQUAL(${VERSION} "1.2.3")
 
-CPMAddPackage(NAME B VERSION 2.4.1)
+CPMAddPackage(
+  NAME B
+  VERSION 2.4.1
+)
 
-CPMAddPackage(NAME B GIT_TAG v2.3.1)
+CPMAddPackage(
+  NAME B
+  GIT_TAG v2.3.1
+)
 
 CPMGetPackageVersion(B VERSION)
-assert_equal(${VERSION} "2.4.1")
+ASSERT_EQUAL(${VERSION} "2.4.1")
 
 CPMAddPackage(
   NAME C
@@ -26,4 +38,4 @@ CPMAddPackage(
 )
 
 CPMGetPackageVersion(C VERSION)
-assert_equal(${VERSION} "3.1.2")
+ASSERT_EQUAL(${VERSION} "3.1.2")

test/unit/dirty-cache-check.cmake

@@ -1,49 +0,0 @@
-include(${CPM_PATH}/CPM.cmake)
-include(${CPM_PATH}/testing.cmake)
-
-set(baseDir "${CMAKE_CURRENT_BINARY_DIR}/test_dirty_cache")
-
-find_package(Git REQUIRED)
-
-function(git_do dir)
-  execute_process(
-    COMMAND ${GIT_EXECUTABLE} -c user.name='User' -c user.email='user@email.org' ${ARGN}
-    RESULT_VARIABLE result
-    OUTPUT_VARIABLE status
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-    WORKING_DIRECTORY "${dir}"
-  )
-  if(result)
-    message(FATAL_ERROR "git ${ARGN} fail: ${result} ${status}")
-  endif()
-endfunction()
-
-file(MAKE_DIRECTORY "${baseDir}")
-
-file(WRITE "${baseDir}/draft.txt" "this is a test")
-
-git_do("${baseDir}" init -b main)
-git_do("${baseDir}" commit --allow-empty -m "empty repo")
-message(STATUS "empty repo with file")
-cpm_check_git_working_dir_is_clean(${baseDir} HEAD emptygit_test)
-assert_falsy(emptygit_test)
-
-git_do("${baseDir}" add draft.txt)
-git_do("${baseDir}" commit -m "test change")
-git_do("${baseDir}" tag v0.0.0)
-message(STATUS "commit a change")
-cpm_check_git_working_dir_is_clean(${baseDir} v0.0.0 onecommit_test)
-assert_truthy(onecommit_test)
-
-file(WRITE "${baseDir}/draft.txt" "a modification")
-message(STATUS "dirty repo")
-cpm_check_git_working_dir_is_clean(${baseDir} v0.0.0 nonemptygit_test)
-assert_falsy(nonemptygit_test)
-
-git_do("${baseDir}" add draft.txt)
-git_do("${baseDir}" commit -m "another change")
-message(STATUS "repo clean")
-cpm_check_git_working_dir_is_clean(${baseDir} v0.0.0 twocommit_test)
-assert_falsy(twocommit_test)
-
-file(REMOVE_RECURSE "${baseDir}")

test/unit/exclude_from_all.cmake

@@ -1,35 +0,0 @@
-include(CMakePackageConfigHelpers)
-include(${CPM_PATH}/testing.cmake)
-
-set(TEST_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/exclude_from_all)
-
-function(init_project EXCLUDE_FROM_ALL)
-  configure_package_config_file(
-    "${CMAKE_CURRENT_LIST_DIR}/broken_dependency/CMakeLists.txt.in"
-    "${CMAKE_CURRENT_LIST_DIR}/broken_dependency/CMakeLists.txt"
-    INSTALL_DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/junk
-  )
-
-  execute_process(
-    COMMAND ${CMAKE_COMMAND} "-S${CMAKE_CURRENT_LIST_DIR}/broken_dependency" "-B${TEST_BUILD_DIR}"
-    RESULT_VARIABLE ret
-  )
-
-  assert_equal(${ret} "0")
-endfunction()
-
-function(build_project expected_success)
-  execute_process(COMMAND ${CMAKE_COMMAND} "--build" "${TEST_BUILD_DIR}" RESULT_VARIABLE ret)
-
-  if(expected_success)
-    assert_equal(${ret} 0)
-  else()
-    assert_not_equal(${ret} 0)
-  endif()
-endfunction()
-
-init_project(FALSE)
-build_project(FALSE)
-
-init_project(TRUE)
-build_project(TRUE)

test/unit/fetchcontent_dependency.cmake

@@ -1,38 +0,0 @@
-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}/fetchcontent_dependency)
-
-function(clear_cache)
-  message(STATUS "clearing CPM cache")
-  file(REMOVE_RECURSE ${CPM_SOURCE_CACHE_DIR})
-  assert_not_exists("${CPM_SOURCE_CACHE_DIR}")
-endfunction()
-
-function(update_cmake_lists)
-  configure_package_config_file(
-    "${CMAKE_CURRENT_LIST_DIR}/fetchcontent_dependency/CMakeLists.txt.in"
-    "${CMAKE_CURRENT_LIST_DIR}/fetchcontent_dependency/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()
-
-# Read CPM_SOURCE_CACHE from arguments
-
-reset_test()
-
-execute_process(
-  COMMAND ${CMAKE_COMMAND} "-S${CMAKE_CURRENT_LIST_DIR}/fetchcontent_dependency"
-          "-B${TEST_BUILD_DIR}" "-DCPM_SOURCE_CACHE=${CPM_SOURCE_CACHE_DIR}" RESULT_VARIABLE ret
-)
-
-assert_equal(${ret} "0")

test/unit/fetchcontent_dependency/.gitignore

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

test/unit/fetchcontent_dependency/CMakeLists.txt.in

@@ -1,38 +0,0 @@
-# ~~~
-#    ┌────────────────────────┐
-#    │ FetchContentDependency │
-#    └─────┬────────────┬─────┘
-#          │1.          │3.
-#          │            │
-# ┌────────▼────┐   ┌───▼─────────┐
-# │ Dependency  ├───►  Fibonacci  │
-# └─────────────┘2. └─────────────┘
-#
-# 1. Add Project with CPMAddPackage
-# 2. Dependency will add Fibonacci with FetchContent
-# 3. Our project add Fibonacci with CPMAddPackage
-# ~~~
-
-cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
-
-project(CPMTest_FetchContentDependency)
-
-# ---- Dependencies ----
-
-include(@CPM_PATH@/CPM.cmake)
-
-# 1 & 2 Dependency will add Fibonacci using FetchContent (1 & 2)
-CPMAddPackage(NAME Dependency SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependency)
-
-# 3 Add again Fibonacci that have already been populated with FetchContent_MakeAvailable
-#
-# * This test should highlight the fact that cpm_add_subdirectory is always called, even when
-#   cpm_fetch_package isn't populating the dependency
-# * NO_CACHE YES highlight a bug introduced in 32b063eba5c754f833725ed4b9e5f352bc3ca959 where
-#   cpm_fetch_package was checking undefined ${lower_case_name}_POPULATED variable
-CPMAddPackage(
-  NAME Fibonacci
-  GIT_REPOSITORY https://github.com/cpm-cmake/testpack-fibonacci.git
-  VERSION 2.0
-  NO_CACHE YES
-)

test/unit/fetchcontent_dependency/dependency/CMakeLists.txt

@@ -1,15 +0,0 @@
-cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
-
-project(CPMTest_Dependency)
-
-# ---- Dependencies ----
-
-include(FetchContent)
-
-FetchContent_Declare(
-  Fibonacci
-  GIT_REPOSITORY https://github.com/cpm-cmake/testpack-fibonacci.git
-  GIT_TAG v2.0
-)
-
-FetchContent_MakeAvailable(Fibonacci)

test/unit/is_git_tag_commit_hash.cmake

@@ -3,20 +3,20 @@ cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 include(${CPM_PATH}/CPM.cmake)
 include(${CPM_PATH}/testing.cmake)
 
-cpm_is_git_tag_commit_hash("v1.2.3" RESULT)
-assert_equal("0" ${RESULT})
+CPM_IS_GIT_TAG_COMMIT_HASH("v1.2.3" RESULT)
+ASSERT_EQUAL("0" ${RESULT})
 
-cpm_is_git_tag_commit_hash("asio-1-12-1" RESULT)
-assert_equal("0" ${RESULT})
+CPM_IS_GIT_TAG_COMMIT_HASH("asio-1-12-1" RESULT)
+ASSERT_EQUAL("0" ${RESULT})
 
-cpm_is_git_tag_commit_hash("513039e3cba83284cec71287fd829865b9f423bc" RESULT)
-assert_equal("1" ${RESULT})
+CPM_IS_GIT_TAG_COMMIT_HASH("513039e3cba83284cec71287fd829865b9f423bc" RESULT)
+ASSERT_EQUAL("1" ${RESULT})
 
-cpm_is_git_tag_commit_hash("513039E3CBA83284CEC71287FD829865B9F423BC" RESULT)
-assert_equal("1" ${RESULT})
+CPM_IS_GIT_TAG_COMMIT_HASH("513039E3CBA83284CEC71287FD829865B9F423BC" RESULT)
+ASSERT_EQUAL("1" ${RESULT})
 
-cpm_is_git_tag_commit_hash("513039E" RESULT)
-assert_equal("1" ${RESULT})
+CPM_IS_GIT_TAG_COMMIT_HASH("513039E" RESULT)
+ASSERT_EQUAL("1" ${RESULT})
 
-cpm_is_git_tag_commit_hash("513039E3CBA8" RESULT)
-assert_equal("1" ${RESULT})
+CPM_IS_GIT_TAG_COMMIT_HASH("513039E3CBA8" RESULT)
+ASSERT_EQUAL("1" ${RESULT})

test/unit/local_dependency/ModuleCMakeLists.txt.in

@@ -24,11 +24,3 @@ endif()
 # ---- Call dependency method to validate correct addition of directory ----
 
 dependency_function()
-
-# ---- Check parameters ----
-
-include(@CPM_PATH@/testing.cmake)
-
-ASSERT_TRUTHY(@TEST_DEPENDENCY_NAME@_ADDED)
-ASSERT_DEFINED(@TEST_DEPENDENCY_NAME@_SOURCE_DIR)
-ASSERT_DEFINED(@TEST_DEPENDENCY_NAME@_BINARY_DIR)

test/unit/local_dependency/OptionsCMakeLists.txt.in

@@ -1,35 +0,0 @@
-cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
-
-project(CPMTest)
-
-# ---- Options ----
-
-option(ENABLE_TEST_COVERAGE "Enable test coverage" OFF)
-
-# ---- Dependencies ----
-
-include(@CPM_PATH@/CPM.cmake)
-
-CPMAddPackage(
-  NAME Dependency
-  SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependency
-  OPTIONS
-    "DEFINE_ALTERNATIVE_FUNCTION YES"
-    "LIST_ARGUMENT a\\\\;b\\\\;c"
-  EXCLUDE_FROM_ALL YES
-)
-
-# ---- Dependencies ----
-
-alternative_dependency_function()
-
-# ---- Check parameters ----
-
-include(@CPM_PATH@/testing.cmake)
-
-message("DEFINE_ALTERNATIVE_FUNCTION: ${DEFINE_ALTERNATIVE_FUNCTION}")
-
-# this option is overridden by CPM.cmake
-ASSERT_NOT_DEFINED(DEFINE_ALTERNATIVE_FUNCTION)
-# this option is leaked by the dependency
-ASSERT_EQUAL(${LEAKED_OPTION} "OFF")

test/unit/local_dependency/OverrideCMakeLists.txt.in

@@ -17,11 +17,3 @@ CPMAddPackage(
 # ---- Call dependency method to validate correct addition of directory ----
 
 dependency_function()
-
-# ---- Check parameters ----
-
-include(@CPM_PATH@/testing.cmake)
-
-ASSERT_TRUTHY(Dependency_ADDED)
-ASSERT_DEFINED(Dependency_SOURCE_DIR)
-ASSERT_DEFINED(Dependency_BINARY_DIR)

test/unit/local_dependency/SubdirCMakeLists.txt.in

@@ -1,17 +0,0 @@
-cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
-
-project(CPMTest)
-
-# ---- Dependencies ----
-
-include(@CPM_PATH@/CPM.cmake)
-
-CPMAddPackage(
-  NAME Dependency
-  SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependency
-  SOURCE_SUBDIR inner
-)
-
-# ---- Call inner dependency method to validate correct addition of subdirectory ----
-
-inner_dependency_function()

test/unit/local_dependency/dependency/CMakeLists.txt

@@ -1,20 +1,4 @@
-cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
 
-option(DEFINE_ALTERNATIVE_FUNCTION "define the alternative function" OFF)
-option(LEAKED_OPTION "this option will be leaked to the outer scope" OFF)
-
-if(NOT DEFINE_ALTERNATIVE_FUNCTION)
-  function(dependency_function)
-    message("called external method")
-  endfunction()
-else()
-
-  # check if list was passed correctly
-  if(NOT "${LIST_ARGUMENT}" STREQUAL "a;b;c")
-    message(FATAL_ERROR "list argument not properly passed to dependency: '${LIST_ARGUMENT}'")
-  endif()
-
-  function(alternative_dependency_function)
-    message("called alternative external method")
-  endfunction()
-endif()
+function(dependency_function)
+  message("called external method")
+endfunction()

test/unit/local_dependency/dependency/inner/CMakeLists.txt

@@ -1,3 +0,0 @@
-function(inner_dependency_function)
-  message("called inner method")
-endfunction()

test/unit/modules.cmake

@@ -1,9 +1,10 @@
+
 include(CMakePackageConfigHelpers)
 include(${CPM_PATH}/testing.cmake)
 
 set(TEST_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/modules)
 
-function(init_project_with_dependency TEST_DEPENDENCY_NAME)
+function(initProjectWithDependency TEST_DEPENDENCY_NAME)
   configure_package_config_file(
     "${CMAKE_CURRENT_LIST_DIR}/local_dependency/ModuleCMakeLists.txt.in"
     "${CMAKE_CURRENT_LIST_DIR}/local_dependency/CMakeLists.txt"
@@ -11,18 +12,19 @@ function(init_project_with_dependency TEST_DEPENDENCY_NAME)
   )
 
   execute_process(
-    COMMAND ${CMAKE_COMMAND} "-S${CMAKE_CURRENT_LIST_DIR}/local_dependency" "-B${TEST_BUILD_DIR}"
+    COMMAND 
+    ${CMAKE_COMMAND} "-H${CMAKE_CURRENT_LIST_DIR}/local_dependency" "-B${TEST_BUILD_DIR}"
     RESULT_VARIABLE ret
   )
 
-  assert_equal(${ret} "0")
+  ASSERT_EQUAL(${ret} "0")
 endfunction()
 
-init_project_with_dependency(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(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)
 
-init_project_with_dependency(B)
-assert_not_exists(${TEST_BUILD_DIR}/CPM_modules/FindA.cmake)
-assert_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/options.cmake

@@ -1,19 +0,0 @@
-include(CMakePackageConfigHelpers)
-include(${CPM_PATH}/testing.cmake)
-
-set(TEST_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/source_dir)
-
-set(TEST_DEPENDENCY_NAME Dependency)
-
-configure_package_config_file(
-  "${CMAKE_CURRENT_LIST_DIR}/local_dependency/OptionsCMakeLists.txt.in"
-  "${CMAKE_CURRENT_LIST_DIR}/local_dependency/CMakeLists.txt"
-  INSTALL_DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/junk
-)
-
-execute_process(
-  COMMAND ${CMAKE_COMMAND} "-S${CMAKE_CURRENT_LIST_DIR}/local_dependency" "-B${TEST_BUILD_DIR}"
-  RESULT_VARIABLE ret
-)
-
-assert_equal(${ret} "0")

test/unit/package-lock.cmake

@@ -1,18 +1,17 @@
+
 include(CMakePackageConfigHelpers)
 include(${CPM_PATH}/testing.cmake)
 
 set(TEST_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/package-lock)
 
-function(configure_with_declare DECLARE_DEPENDENCY)
+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
+  if (DECLARE_DEPENDENCY)
+    set(PREPARE_CODE "CPMDeclarePackage(Dependency
+      NAME Dependency 
       SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/local_dependency/dependency
-    )"
-    )
+    )")
   else()
     set(PREPARE_CODE "")
   endif()
@@ -24,30 +23,27 @@ function(configure_with_declare DECLARE_DEPENDENCY)
   )
 
   execute_process(
-    COMMAND ${CMAKE_COMMAND} -S${CMAKE_CURRENT_LIST_DIR}/local_dependency -B${TEST_BUILD_DIR}
-            -DCPM_INCLUDE_ALL_IN_PACKAGE_LOCK=1 RESULT_VARIABLE ret
+    COMMAND ${CMAKE_COMMAND} -H${CMAKE_CURRENT_LIST_DIR}/local_dependency -B${TEST_BUILD_DIR} -DCPM_INCLUDE_ALL_IN_PACKAGE_LOCK=1
+    RESULT_VARIABLE ret
   )
 
-  assert_equal(${ret} "0")
+  ASSERT_EQUAL(${ret} "0")
 endfunction()
 
-function(update_package_lock)
+function(updatePackageLock)
   execute_process(
     COMMAND ${CMAKE_COMMAND} --build ${TEST_BUILD_DIR} --target cpm-update-package-lock
     RESULT_VARIABLE ret
   )
 
-  assert_equal(${ret} "0")
+  ASSERT_EQUAL(${ret} "0")
 endfunction()
 
-execute_process(
-  COMMAND ${CMAKE_COMMAND} -E rm -f ${CMAKE_CURRENT_LIST_DIR}/local_dependency/package-lock.cmake
-)
-configure_with_declare(YES)
-assert_not_exists(${CMAKE_CURRENT_LIST_DIR}/local_dependency/package-lock.cmake)
-update_package_lock()
-assert_exists(${CMAKE_CURRENT_LIST_DIR}/local_dependency/package-lock.cmake)
-configure_with_declare(NO)
-execute_process(
-  COMMAND ${CMAKE_COMMAND} -E rm -f ${CMAKE_CURRENT_LIST_DIR}/local_dependency/package-lock.cmake
-)
+execute_process(COMMAND ${CMAKE_COMMAND} -E rm -f ${CMAKE_CURRENT_LIST_DIR}/local_dependency/package-lock.cmake)
+configureWithDeclare(YES)
+ASSERT_NOT_EXISTS(${CMAKE_CURRENT_LIST_DIR}/local_dependency/package-lock.cmake)
+updatePackageLock()
+ASSERT_EXISTS(${CMAKE_CURRENT_LIST_DIR}/local_dependency/package-lock.cmake)
+configureWithDeclare(NO)
+execute_process(COMMAND ${CMAKE_COMMAND} -E rm -f ${CMAKE_CURRENT_LIST_DIR}/local_dependency/package-lock.cmake)
+

test/unit/package-lock_prettify.cmake

@@ -1,42 +0,0 @@
-cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
-
-include(${CPM_PATH}/CPM.cmake)
-include(${CPM_PATH}/testing.cmake)
-
-# cmake-format: off
-cpm_prettify_package_arguments(PRETTY_ARGN false
-  NAME Dependency
-  SOURCE_DIR ${CMAKE_SOURCE_DIR}/local_dependency/dependency
-  UPDATE_DISCONNECTED ON
-  TESTCUSTOMDATA TRUE
-)
-# cmake-format: on
-set(EXPECTED_UNCOMMENTED
-    "  NAME Dependency
-  SOURCE_DIR \${CMAKE_SOURCE_DIR}/local_dependency/dependency
-  UPDATE_DISCONNECTED ON TESTCUSTOMDATA TRUE
-"
-)
-assert_equal(${PRETTY_ARGN} ${EXPECTED_UNCOMMENTED})
-
-# cmake-format: off
-cpm_prettify_package_arguments(PRETTY_ARGN true
-  NAME Dependency
-  SOURCE_DIR ${CMAKE_SOURCE_DIR}/local_dependency/dependency
-  UPDATE_DISCONNECTED ON
-  TESTCUSTOMDATA TRUE
-)
-# cmake-format: on
-set(EXPECTED_COMMENTED
-    "#  NAME Dependency
-#  SOURCE_DIR \${CMAKE_SOURCE_DIR}/local_dependency/dependency
-#  UPDATE_DISCONNECTED ON TESTCUSTOMDATA TRUE
-"
-)
-assert_equal(${PRETTY_ARGN} ${EXPECTED_COMMENTED})
-
-cpm_prettify_package_arguments(PRETTY_ARGN true "local directory")
-set(EXPECTED_COMMENTED_LOCALDIR "#  local directory
-"
-)
-assert_equal(${PRETTY_ARGN} ${EXPECTED_COMMENTED_LOCALDIR})

test/unit/package-override.cmake

@@ -1,3 +1,4 @@
+
 include(CMakePackageConfigHelpers)
 include(${CPM_PATH}/testing.cmake)
 
@@ -12,9 +13,8 @@ configure_package_config_file(
 )
 
 execute_process(
-  COMMAND ${CMAKE_COMMAND} -S${CMAKE_CURRENT_LIST_DIR}/local_dependency -B${TEST_BUILD_DIR}
-          -DCPM_Dependency_SOURCE=${CMAKE_CURRENT_LIST_DIR}/local_dependency/dependency
+  COMMAND ${CMAKE_COMMAND} -H${CMAKE_CURRENT_LIST_DIR}/local_dependency -B${TEST_BUILD_DIR} -DCPM_Dependency_SOURCE=${CMAKE_CURRENT_LIST_DIR}/local_dependency/dependency
   RESULT_VARIABLE ret
 )
 
-assert_equal(${ret} "0")
+ASSERT_EQUAL(${ret} "0")

test/unit/package_name_and_ver_from_url.cmake

@@ -1,60 +0,0 @@
-cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
-
-include(${CPM_PATH}/CPM.cmake)
-include(${CPM_PATH}/testing.cmake)
-
-cpm_package_name_and_ver_from_url("https://example.com/coolpack-1.2.3.zip" name ver)
-assert_equal("coolpack" ${name})
-assert_equal("1.2.3" ${ver})
-
-cpm_package_name_and_ver_from_url("https://example.com/cool-pack-v1.3.tar.gz" name ver)
-assert_equal("cool-pack" ${name})
-assert_equal("1.3" ${ver})
-
-cpm_package_name_and_ver_from_url(
-  "https://subd.zip.com/download.php?Cool.Pack-v1.2.3rc0.tar" name ver
-)
-assert_equal("Cool.Pack" ${name})
-assert_equal("1.2.3rc0" ${ver})
-
-cpm_package_name_and_ver_from_url(
-  "http://evil-1.2.tar.gz.com/Plan9_1.2.3a.tar.bz2?download" name ver
-)
-assert_equal("Plan9" ${name})
-assert_equal("1.2.3a" ${ver})
-
-cpm_package_name_and_ver_from_url(
-  "http://evil-1.2.tar.gz.com/Plan_9-1.2.3a.tar.bz2?download" name ver
-)
-assert_equal("Plan_9" ${name})
-assert_equal("1.2.3a" ${ver})
-
-cpm_package_name_and_ver_from_url(
-  "http://evil-1.2.tar.gz.com/Plan-9_1.2.3a.tar.bz2?download" name ver
-)
-assert_equal("Plan-9" ${name})
-assert_equal("1.2.3a" ${ver})
-
-cpm_package_name_and_ver_from_url("https://sf.com/distrib/SFLib-0.999.4.tar.gz/download" name ver)
-assert_equal("SFLib" ${name})
-assert_equal("0.999.4" ${ver})
-
-cpm_package_name_and_ver_from_url("https://example.com/coolpack/v5.6.5rc44.zip" name ver)
-assert_not_defined(name)
-assert_equal("5.6.5rc44" ${ver})
-
-cpm_package_name_and_ver_from_url("evil-1.3.zip.com/coolpack/release999.000beta.ZIP" name ver)
-assert_not_defined(name)
-assert_equal("999.000beta" ${ver})
-
-cpm_package_name_and_ver_from_url("https://example.com/Foo55.tar.gz" name ver)
-assert_equal("Foo55" ${name})
-assert_not_defined(ver)
-
-cpm_package_name_and_ver_from_url("https://example.com/foo" name ver)
-assert_not_defined(name)
-assert_not_defined(ver)
-
-cpm_package_name_and_ver_from_url("example.zip.com/foo" name ver)
-assert_not_defined(name)
-assert_not_defined(ver)

test/unit/package_name_from_git_uri.cmake

@@ -1,28 +0,0 @@
-cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
-
-include(${CPM_PATH}/CPM.cmake)
-include(${CPM_PATH}/testing.cmake)
-
-cpm_package_name_from_git_uri("https://github.com/cpm-cmake/CPM.cmake.git" name)
-assert_equal("CPM.cmake" ${name})
-
-cpm_package_name_from_git_uri("ssh://user@host.xz:123/path/to/pkg.git/" name)
-assert_equal("pkg" ${name})
-
-cpm_package_name_from_git_uri("git://host.xz/path/to/pkg.git" name)
-assert_equal("pkg" ${name})
-
-cpm_package_name_from_git_uri("git@host.xz:cool-pkg.git" name)
-assert_equal("cool-pkg" ${name})
-
-cpm_package_name_from_git_uri("file:///path/to/pkg33.git" name)
-assert_equal("pkg33" ${name})
-
-cpm_package_name_from_git_uri("../local-repo/.git" name)
-assert_equal("local-repo" ${name})
-
-cpm_package_name_from_git_uri("asdf" name)
-assert_not_defined(name)
-
-cpm_package_name_from_git_uri("/something.git/stuff" name)
-assert_not_defined(name)

test/unit/parse_add_package_single_arg.cmake

@@ -1,71 +0,0 @@
-cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
-
-include(${CPM_PATH}/CPM.cmake)
-include(${CPM_PATH}/testing.cmake)
-
-cpm_parse_add_package_single_arg("gh:cpm-cmake/CPM.cmake" args)
-assert_equal("GITHUB_REPOSITORY;cpm-cmake/CPM.cmake" "${args}")
-
-cpm_parse_add_package_single_arg("gh:cpm-cmake/CPM.cmake@1.2.3" args)
-assert_equal("GITHUB_REPOSITORY;cpm-cmake/CPM.cmake;VERSION;1.2.3" "${args}")
-
-cpm_parse_add_package_single_arg("gh:cpm-cmake/CPM.cmake#master" args)
-assert_equal("GITHUB_REPOSITORY;cpm-cmake/CPM.cmake;GIT_TAG;master" "${args}")
-
-cpm_parse_add_package_single_arg("gh:cpm-cmake/CPM.cmake@0.20.3#asdf" args)
-assert_equal("GITHUB_REPOSITORY;cpm-cmake/CPM.cmake;VERSION;0.20.3;GIT_TAG;asdf" "${args}")
-
-cpm_parse_add_package_single_arg("gh:a/b#c@d" args)
-assert_equal("GITHUB_REPOSITORY;a/b;GIT_TAG;c;VERSION;d" "${args}")
-
-cpm_parse_add_package_single_arg("gh:foo#c@d" args)
-assert_equal("GITHUB_REPOSITORY;foo;GIT_TAG;c;VERSION;d" "${args}")
-
-cpm_parse_add_package_single_arg("gh:Foo@5" args)
-assert_equal("GITHUB_REPOSITORY;Foo;VERSION;5" "${args}")
-
-cpm_parse_add_package_single_arg("gl:foo/bar" args)
-assert_equal("GITLAB_REPOSITORY;foo/bar" "${args}")
-
-cpm_parse_add_package_single_arg("gl:foo/Bar" args)
-assert_equal("GITLAB_REPOSITORY;foo/Bar" "${args}")
-
-cpm_parse_add_package_single_arg("bb:foo/bar" args)
-assert_equal("BITBUCKET_REPOSITORY;foo/bar" "${args}")
-
-cpm_parse_add_package_single_arg("bb:foo/Bar" args)
-assert_equal("BITBUCKET_REPOSITORY;foo/Bar" "${args}")
-
-cpm_parse_add_package_single_arg("https://github.com/cpm-cmake/CPM.cmake.git@0.30.5" args)
-assert_equal("GIT_REPOSITORY;https://github.com/cpm-cmake/CPM.cmake.git;VERSION;0.30.5" "${args}")
-
-cpm_parse_add_package_single_arg("git@host.xz:user/pkg.git@0.1.2" args)
-assert_equal("GIT_REPOSITORY;git@host.xz:user/pkg.git;VERSION;0.1.2" "${args}")
-
-cpm_parse_add_package_single_arg("git@host.xz:user/pkg.git@0.1.2#rc" args)
-assert_equal("GIT_REPOSITORY;git@host.xz:user/pkg.git;VERSION;0.1.2;GIT_TAG;rc" "${args}")
-
-cpm_parse_add_package_single_arg(
-  "ssh://user@host.xz:123/path/to/pkg.git#fragment@1.2.3#branch" args
-)
-assert_equal(
-  "GIT_REPOSITORY;ssh://user@host.xz:123/path/to/pkg.git#fragment;VERSION;1.2.3;GIT_TAG;branch"
-  "${args}"
-)
-
-cpm_parse_add_package_single_arg("https://example.org/foo.tar.gz" args)
-assert_equal("URL;https://example.org/foo.tar.gz" "${args}")
-
-cpm_parse_add_package_single_arg("https://example.org/foo.tar.gz#baadf00d@1.2.0" args)
-assert_equal("URL;https://example.org/foo.tar.gz;URL_HASH;baadf00d;VERSION;1.2.0" "${args}")
-
-cpm_parse_add_package_single_arg("https://example.org/foo.tar.gz#MD5=baadf00d" args)
-assert_equal("URL;https://example.org/foo.tar.gz;URL_HASH;MD5=baadf00d" "${args}")
-
-cpm_parse_add_package_single_arg("https://example.org/Foo.zip#SHA3_512=1337" args)
-assert_equal("URL;https://example.org/Foo.zip;URL_HASH;SHA3_512=1337" "${args}")
-
-cpm_parse_add_package_single_arg("ftp://user:pass@server/pathname.zip#fragment#0ddb411@0" args)
-assert_equal(
-  "URL;ftp://user:pass@server/pathname.zip#fragment;URL_HASH;0ddb411;VERSION;0" "${args}"
-)