Skip to content

Commit aa8f18c

Browse files
committed
Fix out-of-the-box vcpkg experience on macos
1 parent 0dec7ca commit aa8f18c

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

src/cmake_generator.cpp

+11-10
Original file line numberDiff line numberDiff line change
@@ -814,19 +814,20 @@ void generate_cmake(const char *path, const parser::Project *parent_project) {
814814
cmd("if")("CMKR_ROOT_PROJECT", "AND", "NOT", "CMKR_DISABLE_VCPKG");
815815
cmd("include")("FetchContent");
816816
comment("Fix warnings about DOWNLOAD_EXTRACT_TIMESTAMP");
817-
// clang-format off
818817
cmd("if")("POLICY", "CMP0135");
819818
cmd("cmake_policy")("SET", "CMP0135", "NEW");
820819
cmd("endif")();
821-
// clang-format on
822-
cmd("message")("STATUS", "Fetching vcpkg (" + version_name + ")...");
823-
cmd("FetchContent_Declare")("vcpkg", "URL", url);
824-
// Not using FetchContent_MakeAvailable here in case vcpkg adds CMakeLists.txt
825-
cmd("FetchContent_GetProperties")("vcpkg");
826-
cmd("if")("NOT", "vcpkg_POPULATED");
827-
cmd("FetchContent_Populate")("vcpkg");
828-
cmd("include")("${vcpkg_SOURCE_DIR}/scripts/buildsystems/vcpkg.cmake");
829-
cmd("endif")();
820+
cmd("message")("STATUS", "Fetching vcpkg (" + version_name + ")...");
821+
cmd("FetchContent_Declare")("vcpkg", "URL", url);
822+
// Not using FetchContent_MakeAvailable here in case vcpkg adds CMakeLists.txt
823+
cmd("FetchContent_GetProperties")("vcpkg");
824+
cmd("if")("NOT", "vcpkg_POPULATED");
825+
cmd("FetchContent_Populate")("vcpkg");
826+
cmd("if")("CMAKE_HOST_SYSTEM_NAME", "STREQUAL", "Darwin", "AND", "NOT", "CMAKE_OSX_ARCHITECTURES");
827+
cmd("set")("CMAKE_OSX_ARCHITECTURES", "${CMAKE_HOST_SYSTEM_PROCESSOR}", "CACHE", "STRING", "", "FORCE");
828+
cmd("endif")();
829+
cmd("include")("${vcpkg_SOURCE_DIR}/scripts/buildsystems/vcpkg.cmake");
830+
cmd("endif")();
830831
cmd("endif")();
831832
endl();
832833
// clang-format on

0 commit comments

Comments
 (0)