set a minimum development version to avoid deprecated error handler call

* use gitlab as source for example library

* bump CPM.cmake version

.github/workflows/publish.yaml

@@ -11,11 +11,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
+
+      - name: Set CPM version by tag
+        run: sed "s/0.27.2-development-version/${GITHUB_REF/refs\/tags\/v}/g" cmake/CPM.cmake > CPM.cmake
+
       - name: Upload CPM.cmake to release
         uses: svenstaro/upload-release-action@v1-release
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: cmake/CPM.cmake
+          file: CPM.cmake
           asset_name: CPM.cmake
           tag: ${{ github.ref }}
           overwrite: true

cmake/CPM.cmake

@@ -3,7 +3,7 @@
 # See https://github.com/TheLartians/CPM.cmake for usage and update instructions.
 #
 # MIT License
-# ----------- 
+# -----------
 #[[
   Copyright (c) 2019 Lars Melchior
 
@@ -28,7 +28,7 @@
 
 cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
-set(CURRENT_CPM_VERSION 0.26.1)
+set(CURRENT_CPM_VERSION 0.27.2-development-version)
 
 if(CPM_DIRECTORY)
   if(NOT CPM_DIRECTORY STREQUAL CMAKE_CURRENT_LIST_DIR)
@@ -42,13 +42,13 @@ See https://github.com/TheLartians/CPM.cmake for more information."
     return()
   endif()
 
-  get_property(CPM_INITIALIZED GLOBAL "" PROPERTY CPM_INITIALIZED SET)   
+  get_property(CPM_INITIALIZED GLOBAL "" PROPERTY CPM_INITIALIZED SET)
   if (CPM_INITIALIZED)
     return()
   endif()
 endif()
 
-set_property(GLOBAL PROPERTY CPM_INITIALIZED true) 
+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})
@@ -125,7 +125,7 @@ function(CPMFindPackage)
   cmake_parse_arguments(CPM_ARGS "" "${oneValueArgs}" "" ${ARGN})
 
   if (NOT DEFINED CPM_ARGS_VERSION)
-    if (DEFINED CPM_ARGS_GIT_TAG) 
+    if (DEFINED CPM_ARGS_GIT_TAG)
       cpm_get_version_from_git_tag("${CPM_ARGS_GIT_TAG}" CPM_ARGS_VERSION)
     endif()
   endif()
@@ -190,6 +190,8 @@ function(CPMAddPackage)
     SOURCE_DIR
     DOWNLOAD_COMMAND
     FIND_PACKAGE_ARGUMENTS
+    NO_CACHE
+    GIT_SHALLOW
   )
 
   set(multiValueArgs
@@ -201,7 +203,7 @@ function(CPMAddPackage)
   # Set default values for arguments
 
   if (NOT DEFINED CPM_ARGS_VERSION)
-    if (DEFINED CPM_ARGS_GIT_TAG) 
+    if (DEFINED CPM_ARGS_GIT_TAG)
       cpm_get_version_from_git_tag("${CPM_ARGS_GIT_TAG}" CPM_ARGS_VERSION)
     endif()
   endif()
@@ -217,7 +219,7 @@ function(CPMAddPackage)
   endif()
 
   if (DEFINED CPM_ARGS_GITLAB_REPOSITORY)
-    list(CPM_ARGS_GIT_REPOSITORY "https://gitlab.com/${CPM_ARGS_GITLAB_REPOSITORY}.git")
+    set(CPM_ARGS_GIT_REPOSITORY "https://gitlab.com/${CPM_ARGS_GITLAB_REPOSITORY}.git")
   endif()
 
   if (DEFINED CPM_ARGS_GIT_REPOSITORY)
@@ -229,6 +231,10 @@ function(CPMAddPackage)
 
   if (DEFINED CPM_ARGS_GIT_TAG)
     list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS GIT_TAG ${CPM_ARGS_GIT_TAG})
+    # If GIT_SHALLOW is explicitly specified, honor the value.
+    if (DEFINED CPM_ARGS_GIT_SHALLOW)
+      list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS GIT_SHALLOW ${CPM_ARGS_GIT_SHALLOW})
+    endif()
   endif()
 
   # Check if package has been added before
@@ -270,7 +276,7 @@ function(CPMAddPackage)
       return()
     endif()
 
-    if(CPM_LOCAL_PACKAGES_ONLY) 
+    if(CPM_LOCAL_PACKAGES_ONLY)
       message(SEND_ERROR "CPM: ${CPM_ARGS_NAME} not found via find_package(${CPM_ARGS_NAME} ${CPM_ARGS_VERSION})")
     endif()
   endif()
@@ -296,7 +302,7 @@ function(CPMAddPackage)
     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)
+  elseif (CPM_SOURCE_CACHE AND NOT CPM_ARGS_NO_CACHE)
     string(TOLOWER ${CPM_ARGS_NAME} lower_case_name)
     set(origin_parameters ${CPM_ARGS_UNPARSED_ARGUMENTS})
     list(SORT origin_parameters)
@@ -308,6 +314,15 @@ function(CPMAddPackage)
       list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS DOWNLOAD_COMMAND "${CMAKE_COMMAND}")
       set(PACKAGE_INFO "${download_directory}")
     else()
+      # Enable shallow clone when GIT_TAG is not a commit hash.
+      # Our guess may not be accurate, but it should guarantee no commit hash get mis-detected.
+      if (NOT DEFINED CPM_ARGS_GIT_SHALLOW)
+        cpm_is_git_tag_commit_hash("${CPM_ARGS_GIT_TAG}" IS_HASH)
+        if (NOT ${IS_HASH})
+          list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS GIT_SHALLOW TRUE)
+        endif()
+      endif()
+
       # remove timestamps so CMake will re-download the dependency
       file(REMOVE_RECURSE ${CMAKE_BINARY_DIR}/_deps/${lower_case_name}-subbuild)
       set(PACKAGE_INFO "${PACKAGE_INFO} -> ${download_directory}")
@@ -353,10 +368,11 @@ macro(cpm_export_variables name)
   SET(${name}_ADDED "${${name}_ADDED}" PARENT_SCOPE)
 endmacro()
 
-# declares a package, so that any call to CPMAddPackage for the 
-# package name will use these arguments instead 
+# 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}}")
+  if (NOT DEFINED "CPM_DECLARATION_${Name}")
     set("CPM_DECLARATION_${Name}" "${ARGN}")
   endif()
 endmacro()
@@ -400,11 +416,11 @@ function(CPMGetPackageVersion PACKAGE OUTPUT)
   set(${OUTPUT} "${CPM_PACKAGE_${PACKAGE}_VERSION}" PARENT_SCOPE)
 endfunction()
 
-# declares a package in FetchContent_Declare 
+# declares a package in FetchContent_Declare
 function (cpm_declare_fetch PACKAGE VERSION INFO)
   message(STATUS "${CPM_INDENT} adding package ${PACKAGE}@${VERSION} (${INFO})")
 
-  if (${CPM_DRY_RUN}) 
+  if (${CPM_DRY_RUN})
     message(STATUS "${CPM_INDENT} package not declared (dry run)")
     return()
   endif()
@@ -416,7 +432,7 @@ endfunction()
 
 # returns properties for a package previously defined by cpm_declare_fetch
 function (cpm_get_fetch_properties PACKAGE)
-  if (${CPM_DRY_RUN}) 
+  if (${CPM_DRY_RUN})
     return()
   endif()
   FetchContent_GetProperties(${PACKAGE})
@@ -426,8 +442,8 @@ function (cpm_get_fetch_properties PACKAGE)
 endfunction()
 
 # downloads a previously declared package via FetchContent
-function (cpm_fetch_package PACKAGE DOWNLOAD_ONLY)  
-  if (${CPM_DRY_RUN}) 
+function (cpm_fetch_package PACKAGE DOWNLOAD_ONLY)
+  if (${CPM_DRY_RUN})
     message(STATUS "${CPM_INDENT} package ${PACKAGE} not fetched (dry run)")
     return()
   endif()
@@ -464,7 +480,7 @@ endfunction()
 # guesses the package version from a git tag
 function(cpm_get_version_from_git_tag GIT_TAG RESULT)
   string(LENGTH ${GIT_TAG} length)
-  if (length EQUAL 40) 
+  if (length EQUAL 40)
     # GIT_TAG is probably a git hash
     SET(${RESULT} 0 PARENT_SCOPE)
   else()
@@ -472,3 +488,18 @@ function(cpm_get_version_from_git_tag GIT_TAG RESULT)
     SET(${RESULT} ${CMAKE_MATCH_1} PARENT_SCOPE)
   endif()
 endfunction()
+
+# guesses if the git tag is a commit hash or an actual tag or a branch nane.
+function(cpm_is_git_tag_commit_hash GIT_TAG RESULT)
+  string(LENGTH "${GIT_TAG}" length)
+  # full hash has 40 characters, and short hash has at least 7 characters.
+  if (length LESS 7 OR length GREATER 40)
+    SET(${RESULT} 0 PARENT_SCOPE)
+  else()
+    if (${GIT_TAG} MATCHES "^[a-fA-F0-9]+$")
+      SET(${RESULT} 1 PARENT_SCOPE)
+    else()
+      SET(${RESULT} 0 PARENT_SCOPE)
+    endif()
+  endif()
+endfunction()

examples/asio-standalone/CMakeLists.txt

@@ -0,0 +1,79 @@
+cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
+
+project(CPMExampleASIOStandalone)
+
+# ---- Dependencies ----
+
+include(../../cmake/CPM.cmake)
+
+find_package(Threads REQUIRED)
+
+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.
+# 2) WIN32_LEAN_AND_MEAN is defined to make Winsock2 work.
+if(asio_ADDED)
+  add_library(asio INTERFACE)
+
+  target_include_directories(asio
+    INTERFACE ${asio_SOURCE_DIR}/asio/include
+  )
+
+  target_compile_definitions(asio
+    INTERFACE
+      ASIO_STANDALONE
+      ASIO_NO_DEPRECATED
+  )
+
+  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)
+        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")
+          set(verMajor "A")
+          string(REGEX REPLACE "^([0-9]+)" ${verMajor} ver ${ver})
+        endif ("${verMajor}" MATCHES "10")
+        # Remove all remaining '.' characters.
+        string(REPLACE "." "" ver ${ver})
+        # Prepend each digit with a zero.
+        string(REGEX REPLACE "([0-9A-Z])" "0\\1" ver ${ver})
+        set(${version} "0x${ver}")
+      endif()
+    endmacro()
+
+    if(NOT DEFINED _WIN32_WINNT)
+      get_win32_winnt(ver)
+      set(_WIN32_WINNT ${ver})
+    endif()
+
+    message(STATUS "Set _WIN32_WINNET=${_WIN32_WINNT}")
+
+    target_compile_definitions(asio
+      INTERFACE
+        _WIN32_WINNT=${_WIN32_WINNT}
+        WIN32_LEAN_AND_MEAN
+    )
+  endif()
+endif()
+
+# ---- Executable ----
+
+add_executable(CPMExampleASIOStandalone main.cpp)
+target_link_libraries(CPMExampleASIOStandalone asio)

examples/asio-standalone/main.cpp

@@ -0,0 +1,118 @@
+//
+// async_tcp_echo_server.cpp
+// ~~~~~~~~~~~~~~~~~~~~~~~~~
+//
+// Copyright (c) 2003-2020 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+//
+// Distributed under the Boost Software License, Version 1.0.
+// (See http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#include <cstdlib>
+#include <iostream>
+#include <memory>
+#include <utility>
+
+#include "asio.hpp"
+
+// An asynchronous tcp echo server.
+// See https://think-async.com/Asio/asio-1.16.1/src/examples/cpp11/echo/async_tcp_echo_server.cpp
+
+using asio::ip::tcp;
+
+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);
+          }
+        });
+  }
+
+  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();
+          }
+        });
+  }
+
+  tcp::socket socket_;
+  enum { max_length = 1024 };
+  char data_[max_length];
+};
+
+class server
+{
+public:
+  server(asio::io_context& io_context, short 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();
+          }
+
+          do_accept();
+        });
+  }
+
+  tcp::acceptor acceptor_;
+};
+
+int main(int argc, char* argv[])
+{
+  try
+  {
+    if (argc != 2)
+    {
+      std::cerr << "Usage: async_tcp_echo_server <port>\n";
+      return 1;
+    }
+
+    asio::io_context io_context;
+
+    server s(io_context, std::atoi(argv[1]));
+
+    io_context.run();
+  }
+  catch (std::exception& e)
+  {
+    std::cerr << "Exception: " << e.what() << "\n";
+  }
+
+  return 0;
+}

examples/benchmark/CMakeLists.txt

@@ -8,7 +8,7 @@ include(../../cmake/CPM.cmake)
 
 CPMAddPackage(
   NAME fibonacci
-  GIT_REPOSITORY https://github.com/TheLartians/Fibonacci.git
+  GITLAB_REPOSITORY TheLartians/Fibonacci
   VERSION 2.0
 )
 

examples/catch2/CMakeLists.txt

@@ -8,7 +8,7 @@ include(../../cmake/CPM.cmake)
 
 CPMAddPackage(
   NAME fibonacci
-  GIT_REPOSITORY https://github.com/TheLartians/Fibonacci.git
+  GITHUB_REPOSITORY TheLartians/Fibonacci
   VERSION 2.0
 )
 

examples/doctest/CMakeLists.txt

@@ -8,7 +8,7 @@ include(../../cmake/CPM.cmake)
 
 CPMAddPackage(
   NAME fibonacci
-  GIT_REPOSITORY https://github.com/TheLartians/Fibonacci.git
+  GITLAB_REPOSITORY TheLartians/Fibonacci
   VERSION 2.0
 )
 

examples/gtest/CMakeLists.txt

@@ -8,7 +8,7 @@ include(../../cmake/CPM.cmake)
 
 CPMAddPackage(
   NAME fibonacci
-  GIT_REPOSITORY https://github.com/TheLartians/Fibonacci.git
+  GITLAB_REPOSITORY TheLartians/Fibonacci
   VERSION 2.0
 )
 

test/unit/cache.cmake

@@ -3,23 +3,19 @@ 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)
+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})
-  
-  if (EXISTS "${CPM_SOURCE_CACHE_DIR}")
-    ASSERTION_FAILED("cache not cleared")
-  endif()
+  ASSERT_NOT_EXISTS("${CPM_SOURCE_CACHE_DIR}")
 endfunction()
 
 function(update_cmake_lists)
   configure_package_config_file(
-    "${CMAKE_CURRENT_LIST_DIR}/cache/CMakeLists.txt.in"
-    "${CMAKE_CURRENT_LIST_DIR}/cache/CMakeLists.txt"
+    "${CMAKE_CURRENT_LIST_DIR}/remote_dependency/CMakeLists.txt.in"
+    "${CMAKE_CURRENT_LIST_DIR}/remote_dependency/CMakeLists.txt"
     INSTALL_DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/junk
   )
 endfunction()
@@ -38,15 +34,12 @@ reset_test()
 
 execute_process(
   COMMAND 
-  ${CMAKE_COMMAND} "-H${CMAKE_CURRENT_LIST_DIR}/cache" "-B${TEST_BUILD_DIR}" "-DCPM_SOURCE_CACHE=${CPM_SOURCE_CACHE_DIR}"
+  ${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")
-
-if (NOT EXISTS "${CPM_SOURCE_CACHE_DIR}/fibonacci")
-  ASSERTION_FAILED("fibonacci not in cache")
-endif()
+ASSERT_EXISTS("${CPM_SOURCE_CACHE_DIR}/fibonacci")
 
 FILE(GLOB FIBONACCI_VERSIONs "${CPM_SOURCE_CACHE_DIR}/fibonacci/*")
 list(LENGTH FIBONACCI_VERSIONs FIBONACCI_VERSION_count)
@@ -84,10 +77,7 @@ execute_process(
 )
 
 ASSERT_EQUAL(${ret} "0")
-
-if (NOT EXISTS "${CPM_SOURCE_CACHE_DIR}/fibonacci")
-  ASSERTION_FAILED("fibonacci not in cache")
-endif()
+ASSERT_EXISTS("${CPM_SOURCE_CACHE_DIR}/fibonacci")
 
 ## Read CPM_SOURCE_CACHE from environment
 
@@ -95,21 +85,18 @@ 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}"
+  ${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")
-
-if (NOT EXISTS "${CPM_SOURCE_CACHE_DIR}/fibonacci")
-  ASSERTION_FAILED("fibonacci not in cache")
-endif()
+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"
+  ${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
 )
 
@@ -121,12 +108,40 @@ reset_test()
 
 execute_process(
   COMMAND 
-  ${CMAKE_COMMAND} -E env "CPM_SOURCE_CACHE=${CMAKE_CURRENT_BINARY_DIR}/junk" ${CMAKE_COMMAND} "-H${CMAKE_CURRENT_LIST_DIR}/cache" "-B${TEST_BUILD_DIR}" "-DCPM_SOURCE_CACHE=${CPM_SOURCE_CACHE_DIR}"
+  ${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")
 
-if (NOT EXISTS "${CPM_SOURCE_CACHE_DIR}/fibonacci")
-  ASSERTION_FAILED("fibonacci not in cache")
-endif()
+## Use NO_CACHE option
+
+set(FIBONACCI_PACKAGE_ARGS "NO_CACHE YES")
+set(FIBONACCI_VERSION 1.0)
+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}/remote_dependency" "-B${TEST_BUILD_DIR}"
+  RESULT_VARIABLE ret
+)
+
+ASSERT_EQUAL(${ret} "0")
+ASSERT_NOT_EXISTS("${CPM_SOURCE_CACHE_DIR}/fibonacci")
+
+## 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} "-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")

test/unit/is_git_tag_commit_hash.cmake

@@ -0,0 +1,22 @@
+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("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("513039E" RESULT)
+ASSERT_EQUAL("1" ${RESULT})
+
+CPM_IS_GIT_TAG_COMMIT_HASH("513039E3CBA8" RESULT)
+ASSERT_EQUAL("1" ${RESULT})

test/unit/modules.cmake

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

test/unit/package-lock.cmake

@@ -10,20 +10,20 @@ function(configureWithDeclare DECLARE_DEPENDENCY)
   if (DECLARE_DEPENDENCY)
     set(PREPARE_CODE "CPMDeclarePackage(Dependency
       NAME Dependency 
-      SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/test_project/dependency
+      SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/local_dependency/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"
+    "${CMAKE_CURRENT_LIST_DIR}/local_dependency/PackageLockCMakeLists.txt.in"
+    "${CMAKE_CURRENT_LIST_DIR}/local_dependency/CMakeLists.txt"
     INSTALL_DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/junk
   )
 
   execute_process(
-    COMMAND ${CMAKE_COMMAND} -H${CMAKE_CURRENT_LIST_DIR}/test_project -B${TEST_BUILD_DIR} -DCPM_INCLUDE_ALL_IN_PACKAGE_LOCK=1
+    COMMAND ${CMAKE_COMMAND} -H${CMAKE_CURRENT_LIST_DIR}/local_dependency -B${TEST_BUILD_DIR} -DCPM_INCLUDE_ALL_IN_PACKAGE_LOCK=1
     RESULT_VARIABLE ret
   )
 
@@ -39,11 +39,11 @@ function(updatePackageLock)
   ASSERT_EQUAL(${ret} "0")
 endfunction()
 
-execute_process(COMMAND ${CMAKE_COMMAND} -E rm -f ${CMAKE_CURRENT_LIST_DIR}/test_project/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}/test_project/package-lock.cmake)
+ASSERT_NOT_EXISTS(${CMAKE_CURRENT_LIST_DIR}/local_dependency/package-lock.cmake)
 updatePackageLock()
-ASSERT_EXISTS(${CMAKE_CURRENT_LIST_DIR}/test_project/package-lock.cmake)
+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}/test_project/package-lock.cmake)
+execute_process(COMMAND ${CMAKE_COMMAND} -E rm -f ${CMAKE_CURRENT_LIST_DIR}/local_dependency/package-lock.cmake)
 

test/unit/package-override.cmake

@@ -7,13 +7,13 @@ 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"
+  "${CMAKE_CURRENT_LIST_DIR}/local_dependency/OverrideCMakeLists.txt.in"
+  "${CMAKE_CURRENT_LIST_DIR}/local_dependency/CMakeLists.txt"
   INSTALL_DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/junk
 )
 
 execute_process(
-  COMMAND ${CMAKE_COMMAND} -H${CMAKE_CURRENT_LIST_DIR}/test_project -B${TEST_BUILD_DIR} -DCPM_Dependency_SOURCE=${CMAKE_CURRENT_LIST_DIR}/test_project/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
 )
 

test/unit/remote_dependency/CMakeLists.txt.in

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

test/unit/source_dir.cmake

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