Move vcpkg to before the project() call

build-cpp · Apr 13, 2024 · e7530dc · e7530dc
1 parent 6774bf6
commit e7530dc
Showing 1 changed file with 25 additions and 27 deletions.
diff --git a/src/cmake_generator.cpp b/src/cmake_generator.cpp
@@ -768,23 +768,6 @@ void generate_cmake(const char *path, const parser::Project *parent_project) {
     gen.conditional_includes(project.include_before);
     gen.conditional_cmake(project.cmake_before);
 
-    if (!project.project_name.empty()) {
-        auto languages = std::make_pair("LANGUAGES", project.project_languages);
-        auto version = std::make_pair("VERSION", project.project_version);
-        auto description = std::make_pair("DESCRIPTION", project.project_description);
-        cmd("project")(project.project_name, languages, version, description).endl();
-
-        for (const auto &language : project.project_languages) {
-            if (language == "CSharp") {
-                cmd("include")("CSharpUtilities").endl();
-                break;
-            }
-        }
-    }
-
-    gen.conditional_includes(project.include_after);
-    gen.conditional_cmake(project.cmake_after);
-
     if (project.vcpkg.enabled()) {
         if (!is_root_project) {
             throw std::runtime_error("[vcpkg] is only supported in the root project");
@@ -814,19 +797,17 @@ void generate_cmake(const char *path, const parser::Project *parent_project) {
         cmd("if")("CMKR_ROOT_PROJECT", "AND", "NOT", "CMKR_DISABLE_VCPKG");
             cmd("include")("FetchContent");
             comment("Fix warnings about DOWNLOAD_EXTRACT_TIMESTAMP");
-            // clang-format off
             cmd("if")("POLICY", "CMP0135");
                 cmd("cmake_policy")("SET", "CMP0135", "NEW");
             cmd("endif")();
-        // clang-format on
-        cmd("message")("STATUS", "Fetching vcpkg (" + version_name + ")...");
-        cmd("FetchContent_Declare")("vcpkg", "URL", url);
-        // Not using FetchContent_MakeAvailable here in case vcpkg adds CMakeLists.txt
-        cmd("FetchContent_GetProperties")("vcpkg");
-        cmd("if")("NOT", "vcpkg_POPULATED");
-        cmd("FetchContent_Populate")("vcpkg");
-        cmd("include")("${vcpkg_SOURCE_DIR}/scripts/buildsystems/vcpkg.cmake");
-        cmd("endif")();
+            cmd("message")("STATUS", "Fetching vcpkg (" + version_name + ")...");
+            cmd("FetchContent_Declare")("vcpkg", "URL", url);
+            // Not using FetchContent_MakeAvailable here in case vcpkg adds CMakeLists.txt
+            cmd("FetchContent_GetProperties")("vcpkg");
+            cmd("if")("NOT", "vcpkg_POPULATED");
+                cmd("FetchContent_Populate")("vcpkg");
+                cmd("include")("${vcpkg_SOURCE_DIR}/scripts/buildsystems/vcpkg.cmake");
+            cmd("endif")();
         cmd("endif")();
         endl();
         // clang-format on
@@ -900,6 +881,23 @@ void generate_cmake(const char *path, const parser::Project *parent_project) {
         ofs << "}\n";
     }
 
+    if (!project.project_name.empty()) {
+        auto languages = std::make_pair("LANGUAGES", project.project_languages);
+        auto version = std::make_pair("VERSION", project.project_version);
+        auto description = std::make_pair("DESCRIPTION", project.project_description);
+        cmd("project")(project.project_name, languages, version, description).endl();
+
+        for (const auto &language : project.project_languages) {
+            if (language == "CSharp") {
+                cmd("include")("CSharpUtilities").endl();
+                break;
+            }
+        }
+    }
+
+    gen.conditional_includes(project.include_after);
+    gen.conditional_cmake(project.cmake_after);
+
     if (!project.packages.empty()) {
         comment("Packages");
         for (const auto &dep : project.packages) {