Bump to 0.2.40

Use absolute paths for vcpkg overlays

CMakeLists.txt

@@ -22,7 +22,7 @@ project(cmkr
 	LANGUAGES
 		CXX
 	VERSION
-		0.2.38
+		0.2.40
 	DESCRIPTION
 		"CMakeLists generator from TOML"
 )

cmake.toml

@@ -4,7 +4,7 @@ cmkr-include = false
 
 [project]
 name = "cmkr"
-version = "0.2.38"
+version = "0.2.40"
 description = "CMakeLists generator from TOML"
 languages = ["CXX"]
 include-after = [

cmake/cmkr.cmake

@@ -2,7 +2,7 @@ include_guard()
 
 # Change these defaults to point to your infrastructure if desired
 set(CMKR_REPO "https://github.com/build-cpp/cmkr" CACHE STRING "cmkr git repository" FORCE)
-set(CMKR_TAG "v0.2.38" CACHE STRING "cmkr git tag (this needs to be available forever)" FORCE)
+set(CMKR_TAG "v0.2.40" CACHE STRING "cmkr git tag (this needs to be available forever)" FORCE)
 set(CMKR_COMMIT_HASH "" CACHE STRING "cmkr git commit hash (optional)" FORCE)
 
 # To bootstrap/generate a cmkr project: cmake -P cmkr.cmake

src/cmake_generator.cpp

@@ -865,12 +865,17 @@ void generate_cmake(const char *path, const parser::Project *parent_project) {
         comment("vcpkg settings");
         auto emit_overlay = [&cmd](const std::string &name, const std::vector<std::string> &overlay) {
             if (!overlay.empty()) {
+                std::vector<std::string> set_args;
                 for (const auto &directory : overlay) {
+                    if (!fs::path(directory).is_relative()) {
+                        throw std::runtime_error("[vcpkg] overlay is not a relative path: " + directory);
+                    }
                     if (!fs::is_directory(directory)) {
                         throw std::runtime_error("[vcpkg] overlay is not a directory: " + directory);
                     }
+                    set_args.emplace_back("${CMAKE_CURRENT_SOURCE_DIR}/" + directory);
                 }
-                cmd("set")(name, overlay);
+                cmd("set")(name, set_args);
             }
         };
         emit_overlay("VCPKG_OVERLAY_PORTS", project.vcpkg.overlay_ports);
@@ -921,6 +926,13 @@ void generate_cmake(const char *path, const parser::Project *parent_project) {
             }
         }
 
+        tsl::ordered_map<std::string, std::string> vcpkg_args = {
+            {"URL", url},
+            {"SUBBUILD_DIR", "CMakeFiles/vcpkg-subbuild"},
+            {"SOURCE_DIR", "vcpkg"},
+            {"BINARY_DIR", "CMakeFiles/vcpkg-build"},
+        };
+
         // CMake to bootstrap vcpkg and download the packages
         // clang-format off
         cmd("if")("CMKR_ROOT_PROJECT", "AND", "NOT", "CMKR_DISABLE_VCPKG");
@@ -930,7 +942,7 @@ void generate_cmake(const char *path, const parser::Project *parent_project) {
                 cmd("cmake_policy")("SET", "CMP0135", "NEW");
             cmd("endif")();
             cmd("message")("STATUS", "Fetching vcpkg (" + version_name + ")...");
-            cmd("FetchContent_Declare")("vcpkg", "URL", url);
+            cmd("FetchContent_Declare")("vcpkg", vcpkg_args);
             // Not using FetchContent_MakeAvailable here in case vcpkg adds CMakeLists.txt
             cmd("FetchContent_GetProperties")("vcpkg");
             cmd("if")("NOT", "vcpkg_POPULATED");