add github action to publish cpm on release

.github/workflows/macos.yml

@@ -1,17 +1,11 @@
 name: MacOS
 
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
+on: [push]
 
 jobs:
   build:
 
-    runs-on: macos-latest
+    runs-on: macOS-10.14
     
     steps:
     - uses: actions/checkout@v1

.github/workflows/publish.yaml

@@ -10,7 +10,6 @@ jobs:
     name: Publish CPM.cmake
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
       - name: Upload CPM.cmake to release
         uses: svenstaro/upload-release-action@v1-release
         with:

.github/workflows/ubuntu.yml

@@ -1,17 +1,11 @@
 name: Ubuntu
 
-on:
-  push:
-    branches:
-    - master
-  pull_request:
-    branches:
-    - master
+on: [push]
 
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     
     steps:
     - uses: actions/checkout@v1

.github/workflows/windows.yml

@@ -1,17 +1,11 @@
 name: Windows
 
-on:
-  push:
-    branches:
-    - master
-  pull_request:
-    branches:
-    - master
+on: [push]
 
 jobs:
   build:
 
-    runs-on: windows-latest
+    runs-on: windows-2019
     
     steps:
     - uses: actions/checkout@v1

README.md

@@ -73,7 +73,7 @@ CPMAddPackage(
 target_link_libraries(tests Catch2)
 ```
 
-See the [examples directory](https://github.com/TheLartians/CPM.cmake/tree/master/examples) for complete examples with source code or the [wiki](https://github.com/TheLartians/CPM.cmake/wiki/More-Snippets) for example snippets.
+See the [examples directory](https://github.com/TheLartians/CPM/tree/master/examples) for complete examples with source code or the [wiki](https://github.com/TheLartians/CPM/wiki/More-Snippets) for example snippets.
 
 ## Adding CPM
 
@@ -81,10 +81,10 @@ To add CPM to your current project, simply add `cmake/CPM.cmake` to your project
 
 ```bash
 mkdir -p cmake
-wget -O cmake/CPM.cmake https://github.com/TheLartians/CPM.cmake/releases/latest/download/CPM.cmake
+wget -O cmake/CPM.cmake https://raw.githubusercontent.com/TheLartians/CPM.cmake/master/cmake/CPM.cmake
 ```
 
-You can also use CMake to download CPM for you. See the [wiki](https://github.com/TheLartians/CPM.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/wiki/Adding-CPM) for more details.
 
 ## Updating CPM
 
@@ -95,7 +95,7 @@ Dependencies using CPM will automatically use the updated script of the outermos
 
 - **Small and reusable projects** CPM takes care of all project dependencies, allowing developers to focus on creating small, well-tested libraries.
 - **Cross-Platform** CPM adds projects directly at the configure stage and is compatible with all CMake toolchains and generators.
-- **Reproducible builds** By versioning dependencies via git commits or tags it is ensured that a project will always be buildable.
+- **Reproducable builds** By versioning dependencies via git commits or tags it is ensured that a project will always be buildable.
 - **Recursive dependencies** Ensures that no dependency is added twice and all are added in the minimum required version.
 - **Plug-and-play** No need to install anything. Just add the script to your project and you're good to go.
 - **No packaging required** Simply add all external sources as a dependency.
@@ -103,9 +103,9 @@ 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/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).
+- **No pre-built binaries** For every new build directory, all dependencies are initially downloaded and built from scratch. To avoid extra downloads it is recommend to set the [`CPM_SOURCE_CACHE`](#CPM_SOURCE_CACHE) environmental variable. Using a caching compiler such as [ccahe](https://github.com/TheLartians/Ccache.cmake) can drastically reduce build time.
+- **Dependent on good CMakeLists** Many libraries do not have CMakeLists that work well for subprojects. Luckily this is slowly changing, however, until then, some manual configuration may be required (see the snippets [below](#snippets) for examples). For best practices on preparing projects for CPM, see the [wiki](https://github.com/TheLartians/CPM/wiki/Preparing-projects-for-CPM). 
+- **First version used** In diamond-shaped dependency graphs (e.g. `A` depends on `C`@1.1 and `B`, which itself depends on `C`@1.2 the first added dependency will be used (in this case `C`@1.1). In this case, B requires a newer version of `C` than `A`, so CPM will emit a warning. This can be resolved by adding a new version of the dependency in the outermost project.
 
 For projects with more complex needs and where an extra setup step doesn't matter, it may be worth to check out an external C++ package manager such as [vcpkg](https://github.com/microsoft/vcpkg), [conan](https://conan.io) or [hunter](https://github.com/ruslo/hunter).
 Dependencies added with `CPMFindPackage` should work with external package managers.
@@ -137,39 +137,10 @@ 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.
 
-## Local package override
-
-Library developers are often in the situation where they work on a locally checked out dependency at the same time as on a consumer project.
-It is possible to override the consumer's dependency with the version by supplying the CMake option `CPM_<dependency name>_SOURCE` set to the absolute path of the local library.
-For example, to use the local version of the dependency `Dep` at the path `/path/to/dep`, the consumer can be built with the following command. 
-
-```bash
-cmake -Bbuild -DCPM_Dep_SOURCE=/path/to/dep
-```
-
-## Package lock
-
-In large projects with many transitive dependencies, it can be useful to introduce a package lock file.
-This will list all CPM.cmake dependencies and can be used to update dependencies without modifying the original `CMakeLists.txt`.
-To use a package lock, add the following line directly after including CPM.cmake.
-
-```cmake
-CPMUsePackageLock(package-lock.cmake)
-```
-
-To create or update the package lock file, build the `cpm-update-package-lock` target.
-
-```bash
-cmake -Bbuild
-cmake --build build --target cpm-update-package-lock
-```
-
-See the [wiki](https://github.com/TheLartians/CPM.cmake/wiki/Package-lock) for more info.
-
 ## Snippets
 
 These examples demonstrate how to include some well-known projects with CPM.
-See the [wiki](https://github.com/TheLartians/CPM.cmake/wiki/More-Snippets) for more snippets.
+See the [wiki](https://github.com/TheLartians/CPM/wiki/More-Snippets) for more snippets.
 
 ### [Catch2](https://github.com/catchorg/Catch2)
 
@@ -299,4 +270,4 @@ For a full example on using CPM to download and configure lua with sol2 see [her
 
 ### Full Examples
 
-See the [examples directory](https://github.com/TheLartians/CPM.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.
+See the [examples directory](https://github.com/TheLartians/CPM/tree/master/examples) for full examples with source code and check out the [wiki](https://github.com/TheLartians/CPM/wiki/More-Snippets) for many more example snippets.

cmake/CPM.cmake

@@ -1,6 +1,6 @@
-# CPM.cmake - CMake's missing package manager
-# ===========================================
-# See https://github.com/TheLartians/CPM.cmake for usage and update instructions.
+# TheLartians/CPM - A simple Git dependency manager
+# =================================================
+# See https://github.com/TheLartians/CPM for usage and update instructions.
 #
 # MIT License
 # ----------- 
@@ -28,11 +28,11 @@
 
 cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
-set(CURRENT_CPM_VERSION 0.27)
+set(CURRENT_CPM_VERSION 0.17)
 
 if(CPM_DIRECTORY)
-  if(NOT CPM_DIRECTORY STREQUAL CMAKE_CURRENT_LIST_DIR)
-    if (CPM_VERSION VERSION_LESS CURRENT_CPM_VERSION)
+  if(NOT ${CPM_DIRECTORY} MATCHES ${CMAKE_CURRENT_LIST_DIR})
+    if (${CPM_VERSION} VERSION_LESS ${CURRENT_CPM_VERSION})
       message(AUTHOR_WARNING "${CPM_INDENT} \
 A dependency is using a more recent CPM version (${CURRENT_CPM_VERSION}) than the current project (${CPM_VERSION}). \
 It is recommended to upgrade CPM to the most recent version. \
@@ -41,25 +41,14 @@ See https://github.com/TheLartians/CPM.cmake for more information."
     endif()
     return()
   endif()
-
-  get_property(CPM_INITIALIZED GLOBAL "" PROPERTY CPM_INITIALIZED SET)   
-  if (CPM_INITIALIZED)
-    return()
-  endif()
 endif()
 
-set_property(GLOBAL PROPERTY CPM_INITIALIZED true) 
-
 option(CPM_USE_LOCAL_PACKAGES "Always try to use `find_package` to get dependencies" $ENV{CPM_USE_LOCAL_PACKAGES})
 option(CPM_LOCAL_PACKAGES_ONLY "Only use `find_package` to get dependencies" $ENV{CPM_LOCAL_PACKAGES_ONLY})
 option(CPM_DOWNLOAD_ALL "Always download dependencies from source" $ENV{CPM_DOWNLOAD_ALL})
-option(CPM_DONT_UPDATE_MODULE_PATH "Don't update the module path to allow using find_package" $ENV{CPM_DONT_UPDATE_MODULE_PATH})
-option(CPM_DONT_CREATE_PACKAGE_LOCK "Don't create a package lock file in the binary path" $ENV{CPM_DONT_CREATE_PACKAGE_LOCK})
-option(CPM_INCLUDE_ALL_IN_PACKAGE_LOCK "Add all packages added through CPM.cmake to the package lock" $ENV{CPM_INCLUDE_ALL_IN_PACKAGE_LOCK})
 
 set(CPM_VERSION ${CURRENT_CPM_VERSION} CACHE INTERNAL "")
 set(CPM_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} CACHE INTERNAL "")
-set(CPM_FILE ${CMAKE_CURRENT_LIST_FILE} CACHE INTERNAL "")
 set(CPM_PACKAGES "" CACHE INTERNAL "")
 set(CPM_DRY_RUN OFF CACHE INTERNAL "Don't download or configure dependencies (for testing)")
 
@@ -71,20 +60,6 @@ endif()
 
 set(CPM_SOURCE_CACHE ${CPM_SOURCE_CACHE_DEFAULT} CACHE PATH "Directory to downlaod CPM dependencies")
 
-if (NOT CPM_DONT_UPDATE_MODULE_PATH)
-  set(CPM_MODULE_PATH "${CMAKE_BINARY_DIR}/CPM_modules" CACHE INTERNAL "")
-  # remove old modules
-  FILE(REMOVE_RECURSE ${CPM_MODULE_PATH})
-  file(MAKE_DIRECTORY ${CPM_MODULE_PATH})
-  # locally added CPM modules should override global packages
-  set(CMAKE_MODULE_PATH "${CPM_MODULE_PATH};${CMAKE_MODULE_PATH}")
-endif()
-
-if (NOT CPM_DONT_CREATE_PACKAGE_LOCK)
-  set(CPM_PACKAGE_LOCK_FILE "${CMAKE_BINARY_DIR}/cpm-package-lock.cmake" CACHE INTERNAL "")
-  file(WRITE ${CPM_PACKAGE_LOCK_FILE} "# CPM Package Lock\n# This file should be committed to version control\n\n")
-endif()
-
 include(FetchContent)
 include(CMakeParseArguments)
 
@@ -95,25 +70,16 @@ endif()
 
 function(cpm_find_package NAME VERSION)
   string(REPLACE " " ";" EXTRA_ARGS "${ARGN}")
-  find_package(${NAME} ${VERSION} ${EXTRA_ARGS} QUIET)
+  find_package(${NAME} ${VERSION} ${EXTRA_ARGS})
   if(${CPM_ARGS_NAME}_FOUND)
-    message(STATUS "${CPM_INDENT} using local package ${CPM_ARGS_NAME}@${VERSION}")
-    CPMRegisterPackage(${CPM_ARGS_NAME} "${VERSION}")
+    message(STATUS "${CPM_INDENT} using local package ${CPM_ARGS_NAME}@${${CPM_ARGS_NAME}_VERSION}")
+    CPMRegisterPackage(${CPM_ARGS_NAME} "${${CPM_ARGS_NAME}_VERSION}")
     set(CPM_PACKAGE_FOUND YES PARENT_SCOPE)
   else()
     set(CPM_PACKAGE_FOUND NO PARENT_SCOPE)
   endif()
 endfunction()
 
-# Create a custom FindXXX.cmake module for a CPM package
-# This prevents `find_package(NAME)` from finding the system library
-function(CPMCreateModuleFile Name)
-  if (NOT CPM_DONT_UPDATE_MODULE_PATH)
-    # erase any previous modules
-    FILE(WRITE ${CPM_MODULE_PATH}/Find${Name}.cmake "include(${CPM_FILE})\n${ARGN}\nset(${Name}_FOUND TRUE)")
-  endif()
-endfunction()
-
 # Find a package locally or fallback to CPMAddPackage
 function(CPMFindPackage)
   set(oneValueArgs
@@ -123,22 +89,10 @@ function(CPMFindPackage)
   )
 
   cmake_parse_arguments(CPM_ARGS "" "${oneValueArgs}" "" ${ARGN})
-
-  if (NOT DEFINED CPM_ARGS_VERSION)
-    if (DEFINED CPM_ARGS_GIT_TAG) 
-      cpm_get_version_from_git_tag("${CPM_ARGS_GIT_TAG}" CPM_ARGS_VERSION)
-    endif()
-  endif()
-
+  
   if (CPM_DOWNLOAD_ALL)
     CPMAddPackage(${ARGN})
-    cpm_export_variables(${CPM_ARGS_NAME})
-    return()
-  endif()
-
-  CPMCheckIfPackageAlreadyAdded(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}" "${CPM_ARGS_OPTIONS}")
-  if (CPM_PACKAGE_ALREADY_ADDED)
-    cpm_export_variables(${CPM_ARGS_NAME})
+    cpm_export_variables()
     return()
   endif()
 
@@ -146,51 +100,24 @@ function(CPMFindPackage)
 
   if(NOT CPM_PACKAGE_FOUND)
     CPMAddPackage(${ARGN})
-    cpm_export_variables(${CPM_ARGS_NAME})
+    cpm_export_variables()
   endif()
 
 endfunction()
 
-# checks if a package has been added before
-function(CPMCheckIfPackageAlreadyAdded CPM_ARGS_NAME CPM_ARGS_VERSION CPM_ARGS_OPTIONS)
-  if ("${CPM_ARGS_NAME}" IN_LIST CPM_PACKAGES)
-    CPMGetPackageVersion(${CPM_ARGS_NAME} CPM_PACKAGE_VERSION)
-    if("${CPM_PACKAGE_VERSION}" VERSION_LESS "${CPM_ARGS_VERSION}")
-      message(WARNING "${CPM_INDENT} requires a newer version of ${CPM_ARGS_NAME} (${CPM_ARGS_VERSION}) than currently included (${CPM_PACKAGE_VERSION}).")
-    endif()
-    if (CPM_ARGS_OPTIONS)
-      foreach(OPTION ${CPM_ARGS_OPTIONS})
-        cpm_parse_option(${OPTION})
-        if(NOT "${${OPTION_KEY}}" STREQUAL "${OPTION_VALUE}")
-          message(WARNING "${CPM_INDENT} ignoring package option for ${CPM_ARGS_NAME}: ${OPTION_KEY} = ${OPTION_VALUE} (${${OPTION_KEY}})")
-        endif()
-      endforeach()
-    endif()
-    cpm_get_fetch_properties(${CPM_ARGS_NAME})
-    SET(${CPM_ARGS_NAME}_ADDED NO)
-    SET(CPM_PACKAGE_ALREADY_ADDED YES PARENT_SCOPE)
-    cpm_export_variables(${CPM_ARGS_NAME})
-  else()
-    SET(CPM_PACKAGE_ALREADY_ADDED NO PARENT_SCOPE)
-  endif()
-endfunction()
-
 # Download and add a package from source
 function(CPMAddPackage)
 
   set(oneValueArgs
     NAME
-    FORCE
     VERSION
     GIT_TAG
     DOWNLOAD_ONLY
     GITHUB_REPOSITORY
     GITLAB_REPOSITORY
-    GIT_REPOSITORY
     SOURCE_DIR
     DOWNLOAD_COMMAND
     FIND_PACKAGE_ARGUMENTS
-    NO_CACHE
   )
 
   set(multiValueArgs
@@ -199,75 +126,10 @@ function(CPMAddPackage)
 
   cmake_parse_arguments(CPM_ARGS "" "${oneValueArgs}" "${multiValueArgs}" "${ARGN}")
 
-  # Set default values for arguments
-
-  if (NOT DEFINED CPM_ARGS_VERSION)
-    if (DEFINED CPM_ARGS_GIT_TAG) 
-      cpm_get_version_from_git_tag("${CPM_ARGS_GIT_TAG}" CPM_ARGS_VERSION)
-    endif()
-  endif()
-
-  if(CPM_ARGS_DOWNLOAD_ONLY)
-    set(DOWNLOAD_ONLY ${CPM_ARGS_DOWNLOAD_ONLY})
-  else()
-    set(DOWNLOAD_ONLY NO)
-  endif()
-
-  if (DEFINED CPM_ARGS_GITHUB_REPOSITORY)
-    set(CPM_ARGS_GIT_REPOSITORY "https://github.com/${CPM_ARGS_GITHUB_REPOSITORY}.git")
-  endif()
-
-  if (DEFINED CPM_ARGS_GITLAB_REPOSITORY)
-    list(CPM_ARGS_GIT_REPOSITORY "https://gitlab.com/${CPM_ARGS_GITLAB_REPOSITORY}.git")
-  endif()
-
-  if (DEFINED CPM_ARGS_GIT_REPOSITORY)
-    list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS GIT_REPOSITORY ${CPM_ARGS_GIT_REPOSITORY})
-    if (NOT DEFINED CPM_ARGS_GIT_TAG)
-      set(CPM_ARGS_GIT_TAG v${CPM_ARGS_VERSION})
-    endif()
-  endif()
-
-  if (DEFINED CPM_ARGS_GIT_TAG)
-    list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS GIT_TAG ${CPM_ARGS_GIT_TAG})
-  endif()
-
-  # Check if package has been added before
-  CPMCheckIfPackageAlreadyAdded(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}" "${CPM_ARGS_OPTIONS}")
-  if (CPM_PACKAGE_ALREADY_ADDED)
-    cpm_export_variables(${CPM_ARGS_NAME})
-    return()
-  endif()
-
-  # Check for manual overrides
-  if (NOT CPM_ARGS_FORCE AND NOT "${CPM_${CPM_ARGS_NAME}_SOURCE}" STREQUAL "")
-    set(PACKAGE_SOURCE ${CPM_${CPM_ARGS_NAME}_SOURCE})
-    set(CPM_${CPM_ARGS_NAME}_SOURCE "")
-    CPMAddPackage(
-      NAME ${CPM_ARGS_NAME}
-      SOURCE_DIR ${PACKAGE_SOURCE}
-      FORCE True
-    )
-    cpm_export_variables(${CPM_ARGS_NAME})
-    return()
-  endif()
-
-  # Check for available declaration
-  if (NOT CPM_ARGS_FORCE AND NOT "${CPM_DECLARATION_${CPM_ARGS_NAME}}" STREQUAL "")
-    set(declaration ${CPM_DECLARATION_${CPM_ARGS_NAME}})
-    set(CPM_DECLARATION_${CPM_ARGS_NAME} "")
-    CPMAddPackage(${declaration})
-    cpm_export_variables(${CPM_ARGS_NAME})
-    # checking again to ensure version and option compatibility
-    CPMCheckIfPackageAlreadyAdded(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}" "${CPM_ARGS_OPTIONS}")
-    return()
-  endif()
-
   if(CPM_USE_LOCAL_PACKAGES OR CPM_LOCAL_PACKAGES_ONLY)
     cpm_find_package(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}" ${CPM_ARGS_FIND_PACKAGE_ARGUMENTS})
 
     if(CPM_PACKAGE_FOUND)
-      cpm_export_variables(${CPM_ARGS_NAME})
       return()
     endif()
 
@@ -276,7 +138,58 @@ function(CPMAddPackage)
     endif()
   endif()
 
-  CPMRegisterPackage("${CPM_ARGS_NAME}" "${CPM_ARGS_VERSION}")
+  if (NOT DEFINED CPM_ARGS_VERSION)
+    if (DEFINED CPM_ARGS_GIT_TAG) 
+      cpm_get_version_from_git_tag("${CPM_ARGS_GIT_TAG}" CPM_ARGS_VERSION)
+    endif()
+    if (NOT DEFINED CPM_ARGS_VERSION) 
+      set(CPM_ARGS_VERSION 0)
+    endif()
+  endif()
+
+  if (NOT DEFINED CPM_ARGS_GIT_TAG)
+    set(CPM_ARGS_GIT_TAG v${CPM_ARGS_VERSION})
+  endif()
+
+  list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS GIT_TAG ${CPM_ARGS_GIT_TAG})
+
+  if(CPM_ARGS_DOWNLOAD_ONLY)
+    set(DOWNLOAD_ONLY ${CPM_ARGS_DOWNLOAD_ONLY})
+  else()
+    set(DOWNLOAD_ONLY NO)
+  endif()
+
+  if (CPM_ARGS_GITHUB_REPOSITORY)
+    list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS GIT_REPOSITORY "https://github.com/${CPM_ARGS_GITHUB_REPOSITORY}.git")
+  endif()
+
+  if (CPM_ARGS_GITLAB_REPOSITORY)
+    list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS GIT_REPOSITORY "https://gitlab.com/${CPM_ARGS_GITLAB_REPOSITORY}.git")
+  endif()
+
+  if (${CPM_ARGS_NAME} IN_LIST CPM_PACKAGES)
+    CPMGetPackageVersion(${CPM_ARGS_NAME} CPM_PACKAGE_VERSION)
+    if(${CPM_PACKAGE_VERSION} VERSION_LESS ${CPM_ARGS_VERSION})
+      message(WARNING "${CPM_INDENT} requires a newer version of ${CPM_ARGS_NAME} (${CPM_ARGS_VERSION}) than currently included (${CPM_PACKAGE_VERSION}).")
+    endif()
+    if (CPM_ARGS_OPTIONS)
+      foreach(OPTION ${CPM_ARGS_OPTIONS})
+        cpm_parse_option(${OPTION})
+        if(NOT "${${OPTION_KEY}}" STREQUAL ${OPTION_VALUE})
+          message(WARNING "${CPM_INDENT} ignoring package option for ${CPM_ARGS_NAME}: ${OPTION_KEY} = ${OPTION_VALUE} (${${OPTION_KEY}})")
+        endif()
+      endforeach()
+    endif()
+    cpm_fetch_package(${CPM_ARGS_NAME} ${DOWNLOAD_ONLY})
+    cpm_get_fetch_properties(${CPM_ARGS_NAME})
+    SET(${CPM_ARGS_NAME}_SOURCE_DIR "${${CPM_ARGS_NAME}_SOURCE_DIR}")
+    SET(${CPM_ARGS_NAME}_BINARY_DIR "${${CPM_ARGS_NAME}_BINARY_DIR}")  
+    SET(${CPM_ARGS_NAME}_ADDED NO)
+    cpm_export_variables()
+    return()
+  endif()
+
+  CPMRegisterPackage(${CPM_ARGS_NAME} ${CPM_ARGS_VERSION})
 
   if (CPM_ARGS_OPTIONS)
     foreach(OPTION ${CPM_ARGS_OPTIONS})
@@ -285,28 +198,27 @@ function(CPMAddPackage)
     endforeach()
   endif()
 
+  set(FETCH_CONTENT_DECLARE_EXTRA_OPTS "")
+
   if (DEFINED CPM_ARGS_GIT_TAG)
     set(PACKAGE_INFO "${CPM_ARGS_GIT_TAG}")
-  elseif (DEFINED CPM_ARGS_SOURCE_DIR)
-    set(PACKAGE_INFO "${CPM_ARGS_SOURCE_DIR}")
   else()
     set(PACKAGE_INFO "${CPM_ARGS_VERSION}")
   endif()
 
   if (DEFINED CPM_ARGS_DOWNLOAD_COMMAND)
-    list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS DOWNLOAD_COMMAND ${CPM_ARGS_DOWNLOAD_COMMAND})
-  elseif (DEFINED CPM_ARGS_SOURCE_DIR)
-    list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS SOURCE_DIR ${CPM_ARGS_SOURCE_DIR})
-  elseif (CPM_SOURCE_CACHE AND NOT CPM_ARGS_NO_CACHE)
+    set(FETCH_CONTENT_DECLARE_EXTRA_OPTS DOWNLOAD_COMMAND ${CPM_ARGS_DOWNLOAD_COMMAND})
+  elseif(DEFINED CPM_ARGS_SOURCE_DIR)
+    set(FETCH_CONTENT_DECLARE_EXTRA_OPTS SOURCE_DIR ${CPM_ARGS_SOURCE_DIR})
+  elseif (CPM_SOURCE_CACHE)
     string(TOLOWER ${CPM_ARGS_NAME} lower_case_name)
     set(origin_parameters ${CPM_ARGS_UNPARSED_ARGUMENTS})
     list(SORT origin_parameters)
     string(SHA1 origin_hash "${origin_parameters}")
     set(download_directory ${CPM_SOURCE_CACHE}/${lower_case_name}/${origin_hash})
-    list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS SOURCE_DIR ${download_directory})
+    list(APPEND FETCH_CONTENT_DECLARE_EXTRA_OPTS SOURCE_DIR ${download_directory})
     if (EXISTS ${download_directory})
-      # disable the download command to allow offline builds
-      list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS DOWNLOAD_COMMAND "${CMAKE_COMMAND}")
+      list(APPEND FETCH_CONTENT_DECLARE_EXTRA_OPTS DOWNLOAD_COMMAND ":")
       set(PACKAGE_INFO "${download_directory}")
     else()
       # remove timestamps so CMake will re-download the dependency
@@ -315,82 +227,22 @@ function(CPMAddPackage)
     endif()
   endif()
 
-  CPMCreateModuleFile(${CPM_ARGS_NAME} "CPMAddPackage(${ARGN})")
-
-  if (CPM_PACKAGE_LOCK_ENABLED)
-    if ((CPM_ARGS_VERSION AND NOT CPM_ARGS_SOURCE_DIR) OR CPM_INCLUDE_ALL_IN_PACKAGE_LOCK)
-      cpm_add_to_package_lock(${CPM_ARGS_NAME} "${ARGN}")
-    elseif(CPM_ARGS_SOURCE_DIR)
-      cpm_add_comment_to_package_lock(${CPM_ARGS_NAME} "local directory")
-    else()
-      cpm_add_comment_to_package_lock(${CPM_ARGS_NAME} "${ARGN}")
-    endif()
-  endif()
-
-  cpm_declare_fetch("${CPM_ARGS_NAME}" "${CPM_ARGS_VERSION}" "${PACKAGE_INFO}" "${CPM_ARGS_UNPARSED_ARGUMENTS}")
-  cpm_fetch_package("${CPM_ARGS_NAME}" "${DOWNLOAD_ONLY}")
-  cpm_get_fetch_properties("${CPM_ARGS_NAME}")
-
+  cpm_declare_fetch(${CPM_ARGS_NAME} ${CPM_ARGS_VERSION} ${PACKAGE_INFO} "${CPM_ARGS_UNPARSED_ARGUMENTS}" ${FETCH_CONTENT_DECLARE_EXTRA_OPTS})
+  cpm_fetch_package(${CPM_ARGS_NAME} ${DOWNLOAD_ONLY})
+  cpm_get_fetch_properties(${CPM_ARGS_NAME})
   SET(${CPM_ARGS_NAME}_ADDED YES)
-  cpm_export_variables("${CPM_ARGS_NAME}")
+  cpm_export_variables()
 endfunction()
 
-# Fetch a previously declared package
-macro(CPMGetPackage Name)
-  if (DEFINED "CPM_DECLARATION_${Name}")
-    CPMAddPackage(
-      NAME ${Name}
-    )
-  else()
-    message(SEND_ERROR "Cannot retrieve package ${Name}: no declaration available")
-  endif()
-endmacro()
-
 # export variables available to the caller to the parent scope
 # expects ${CPM_ARGS_NAME} to be set
-macro(cpm_export_variables name)
-  SET(${name}_SOURCE_DIR "${${name}_SOURCE_DIR}" PARENT_SCOPE)
-  SET(${name}_BINARY_DIR "${${name}_BINARY_DIR}" PARENT_SCOPE)
-  SET(${name}_ADDED "${${name}_ADDED}" PARENT_SCOPE)
+macro(cpm_export_variables)
+  SET(${CPM_ARGS_NAME}_SOURCE_DIR "${${CPM_ARGS_NAME}_SOURCE_DIR}" PARENT_SCOPE)
+  SET(${CPM_ARGS_NAME}_BINARY_DIR "${${CPM_ARGS_NAME}_BINARY_DIR}" PARENT_SCOPE)
+  SET(${CPM_ARGS_NAME}_ADDED "${${CPM_ARGS_NAME}_ADDED}" PARENT_SCOPE)
 endmacro()
 
-# declares a package, so that any call to CPMAddPackage for the 
-# package name will use these arguments instead.
-# Previous declarations will not be overriden.
-macro(CPMDeclarePackage Name)
-  if (NOT DEFINED "CPM_DECLARATION_${Name}")
-    set("CPM_DECLARATION_${Name}" "${ARGN}")
-  endif()
-endmacro()
-
-function(cpm_add_to_package_lock Name)
-  if (NOT CPM_DONT_CREATE_PACKAGE_LOCK)
-    file(APPEND ${CPM_PACKAGE_LOCK_FILE} "# ${Name}\nCPMDeclarePackage(${Name} \"${ARGN}\")\n")
-  endif()
-endfunction()
-
-function(cpm_add_comment_to_package_lock Name)
-  if (NOT CPM_DONT_CREATE_PACKAGE_LOCK)
-    file(APPEND ${CPM_PACKAGE_LOCK_FILE} "# ${Name} (unversioned)\n# CPMDeclarePackage(${Name} \"${ARGN}\")\n")
-  endif()
-endfunction()
-
-# includes the package lock file if it exists and creates a target
-# `cpm-write-package-lock` to update it
-macro(CPMUsePackageLock file)
-  if (NOT CPM_DONT_CREATE_PACKAGE_LOCK)
-    get_filename_component(CPM_ABSOLUTE_PACKAGE_LOCK_PATH ${file} ABSOLUTE)
-    if(EXISTS ${CPM_ABSOLUTE_PACKAGE_LOCK_PATH})
-      include(${CPM_ABSOLUTE_PACKAGE_LOCK_PATH})
-    endif()
-    if (NOT TARGET cpm-update-package-lock)
-      add_custom_target(cpm-update-package-lock COMMAND ${CMAKE_COMMAND} -E copy ${CPM_PACKAGE_LOCK_FILE} ${CPM_ABSOLUTE_PACKAGE_LOCK_PATH})
-    endif()
-    set(CPM_PACKAGE_LOCK_ENABLED true)
-  endif()
-endmacro()
-
-# registers a package that has been added to CPM
+# declares that a package has been added to CPM
 function(CPMRegisterPackage PACKAGE VERSION)
   list(APPEND CPM_PACKAGES ${PACKAGE})
   set(CPM_PACKAGES ${CPM_PACKAGES} CACHE INTERNAL "")
@@ -411,7 +263,8 @@ function (cpm_declare_fetch PACKAGE VERSION INFO)
     return()
   endif()
 
-  FetchContent_Declare(${PACKAGE}
+  FetchContent_Declare(
+    ${PACKAGE}
     ${ARGN}
   )
 endfunction()
@@ -429,22 +282,22 @@ endfunction()
 
 # downloads a previously declared package via FetchContent
 function (cpm_fetch_package PACKAGE DOWNLOAD_ONLY)  
+
   if (${CPM_DRY_RUN}) 
     message(STATUS "${CPM_INDENT} package ${PACKAGE} not fetched (dry run)")
     return()
   endif()
 
-  if(DOWNLOAD_ONLY)
-    FetchContent_GetProperties(${PACKAGE})
-    if(NOT ${PACKAGE}_POPULATED)
+  set(CPM_OLD_INDENT "${CPM_INDENT}")
+  set(CPM_INDENT "${CPM_INDENT} ${PACKAGE}:")
+  if(${DOWNLOAD_ONLY})
+    if(NOT "${PACKAGE}_POPULATED")
       FetchContent_Populate(${PACKAGE})
     endif()
   else()
-    set(CPM_OLD_INDENT "${CPM_INDENT}")
-    set(CPM_INDENT "${CPM_INDENT} ${PACKAGE}:")
     FetchContent_MakeAvailable(${PACKAGE})
-    set(CPM_INDENT "${CPM_OLD_INDENT}")
   endif()
+  set(CPM_INDENT "${CPM_OLD_INDENT}")
 endfunction()
 
 # splits a package option

cmake/testing.cmake

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

examples/catch2/CMakeLists.txt

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

examples/cxxopts/CMakeLists.txt

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

examples/doctest/CMakeLists.txt

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

examples/gtest/CMakeLists.txt

@@ -2,6 +2,10 @@ cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
 project(CPMExampleGtest)
 
+# ---- Options ----
+
+option(ENABLE_TEST_COVERAGE "Enable test coverage" OFF)
+
 # ---- Dependencies ----
 
 include(../../cmake/CPM.cmake)
@@ -32,3 +36,10 @@ set_target_properties(CPMExampleGtest PROPERTIES CXX_STANDARD 17)
 
 enable_testing() 
 add_test(CPMExampleGtest CPMExampleGtest)
+
+# ---- Add code coverage ----
+
+if (${ENABLE_TEST_COVERAGE})
+  set_target_properties(CPMExampleGtest PROPERTIES CXX_STANDARD 17 COMPILE_FLAGS "-O0 -g -fprofile-arcs -ftest-coverage --coverage")
+  target_link_options(CPMExampleGtest PUBLIC "--coverage")
+endif()

test/unit/cache.cmake

@@ -3,13 +3,16 @@ cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 include(${CPM_PATH}/testing.cmake)
 include(CMakePackageConfigHelpers)
 
+
 set(CPM_SOURCE_CACHE_DIR "${CMAKE_CURRENT_BINARY_DIR}/CPM")
 set(TEST_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/cache)
 
 function(clear_cache)
-  message(STATUS "clearing CPM cache")
   FILE(REMOVE_RECURSE ${CPM_SOURCE_CACHE_DIR})
-  ASSERT_NOT_EXISTS("${CPM_SOURCE_CACHE_DIR}")
+  
+  if (EXISTS "${CPM_SOURCE_CACHE_DIR}")
+    ASSERTION_FAILED("cache not cleared")
+  endif()
 endfunction()
 
 function(update_cmake_lists)
@@ -39,7 +42,10 @@ execute_process(
 )
 
 ASSERT_EQUAL(${ret} "0")
-ASSERT_EXISTS("${CPM_SOURCE_CACHE_DIR}/fibonacci")
+
+if (NOT EXISTS "${CPM_SOURCE_CACHE_DIR}/fibonacci")
+  ASSERTION_FAILED("fibonacci not in cache")
+endif()
 
 FILE(GLOB FIBONACCI_VERSIONs "${CPM_SOURCE_CACHE_DIR}/fibonacci/*")
 list(LENGTH FIBONACCI_VERSIONs FIBONACCI_VERSION_count)
@@ -77,7 +83,10 @@ execute_process(
 )
 
 ASSERT_EQUAL(${ret} "0")
-ASSERT_EXISTS("${CPM_SOURCE_CACHE_DIR}/fibonacci")
+
+if (NOT EXISTS "${CPM_SOURCE_CACHE_DIR}/fibonacci")
+  ASSERTION_FAILED("fibonacci not in cache")
+endif()
 
 ## Read CPM_SOURCE_CACHE from environment
 
@@ -90,17 +99,10 @@ execute_process(
 )
 
 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} "-H${CMAKE_CURRENT_LIST_DIR}/cache" "-B${TEST_BUILD_DIR}-2"
-  RESULT_VARIABLE ret
-)
-
-ASSERT_EQUAL(${ret} "0")
+if (NOT EXISTS "${CPM_SOURCE_CACHE_DIR}/fibonacci")
+  ASSERTION_FAILED("fibonacci not in cache")
+endif()
 
 ## Overwrite CPM_SOURCE_CACHE with argument
 
@@ -113,19 +115,7 @@ execute_process(
 )
 
 ASSERT_EQUAL(${ret} "0")
-ASSERT_EXISTS("${CPM_SOURCE_CACHE_DIR}/fibonacci")
 
-## Use NO_CACHE option
-
-set(FIBONACCI_PACKAGE_ARGS "NO_CACHE YES")
-update_cmake_lists()
-reset_test()
-
-execute_process(
-  COMMAND 
-  ${CMAKE_COMMAND} -E env "CPM_SOURCE_CACHE=${CPM_SOURCE_CACHE_DIR}" ${CMAKE_COMMAND} "-H${CMAKE_CURRENT_LIST_DIR}/cache" "-B${TEST_BUILD_DIR}"
-  RESULT_VARIABLE ret
-)
-
-ASSERT_EQUAL(${ret} "0")
-ASSERT_NOT_EXISTS("${CPM_SOURCE_CACHE_DIR}/fibonacci")
+if (NOT EXISTS "${CPM_SOURCE_CACHE_DIR}/fibonacci")
+  ASSERTION_FAILED("fibonacci not in cache")
+endif()

test/unit/cache/CMakeLists.txt.in

@@ -14,7 +14,6 @@ CPMAddPackage(
   NAME fibonacci
   GIT_REPOSITORY https://github.com/TheLartians/Fibonacci.git
   VERSION @FIBONACCI_VERSION@
-  @FIBONACCI_PACKAGE_ARGS@
 )
 
 # ---- Create binary ----

test/unit/modules.cmake

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

test/unit/package-lock.cmake

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

test/unit/package-override.cmake

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

test/unit/source_dir.cmake

@@ -4,17 +4,15 @@ include(${CPM_PATH}/testing.cmake)
 
 set(TEST_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/source_dir)
 
-set(TEST_DEPENDENCY_NAME Dependency)
-
 configure_package_config_file(
-  "${CMAKE_CURRENT_LIST_DIR}/test_project/ModuleCMakeLists.txt.in"
-  "${CMAKE_CURRENT_LIST_DIR}/test_project/CMakeLists.txt"
+  "${CMAKE_CURRENT_LIST_DIR}/source_dir/CMakeLists.txt.in"
+  "${CMAKE_CURRENT_LIST_DIR}/source_dir/CMakeLists.txt"
   INSTALL_DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/junk
 )
 
 execute_process(
   COMMAND 
-  ${CMAKE_COMMAND} "-H${CMAKE_CURRENT_LIST_DIR}/test_project" "-B${TEST_BUILD_DIR}"
+  ${CMAKE_COMMAND} "-H${CMAKE_CURRENT_LIST_DIR}/source_dir" "-B${TEST_BUILD_DIR}"
   RESULT_VARIABLE ret
 )
 

test/unit/source_dir/.gitignore

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

test/unit/source_dir/CMakeLists.txt.in

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
-project(CPMTest)
+project(CPMExampleCatch2)
 
 # ---- Options ----
 
@@ -12,6 +12,7 @@ include(@CPM_PATH@/CPM.cmake)
 
 CPMAddPackage(
   NAME Dependency
+  SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependency
 )
 
 # ---- Call dependency method to validate correct addition of directory ----

test/unit/test_project/.gitignore

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

test/unit/test_project/ModuleCMakeLists.txt.in

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

test/unit/test_project/PackageLockCMakeLists.txt.in

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