Merge pull request #5523 from ChrisCatCP/tools_cmake

use ALL_BUILD project build for msvc
xmake-io · Aug 28, 2024 · c9cf6e7 · c9cf6e7
2 parents 3fbd469 + 8eee558
commit c9cf6e7
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua
@@ -994,8 +994,9 @@ end
 
 -- do build for msvc
 function _build_for_msvc(package, configs, opt)
-    local slnfile = assert(find_file("*.sln", os.curdir()), "*.sln file not found!")
-    msbuild.build(package, {slnfile, "-t:Rebuild"})
+    local allbuild = os.isfile("ALL_BUILD.vcxproj") and "ALL_BUILD.vcxproj" or "ALL_BUILD.vcproj"
+    assert(os.isfile(allbuild), "ALL_BUILD project not found!")
+    msbuild.build(package, {allbuild, "-t:Rebuild"})
 end
 
 -- do build for make
@@ -1056,8 +1057,9 @@ end
 
 -- do install for msvc
 function _install_for_msvc(package, configs, opt)
-    local slnfile = assert(find_file("*.sln", os.curdir()), "*.sln file not found!")
-    msbuild.build(package, {slnfile, "-t:Rebuild", "/nr:false"})
+    local allbuild = os.isfile("ALL_BUILD.vcxproj") and "ALL_BUILD.vcxproj" or "ALL_BUILD.vcproj"
+    assert(os.isfile(allbuild), "ALL_BUILD project not found!")
+    msbuild.build(package, {allbuild, "-t:Rebuild", "/nr:false"})
     local projfile = os.isfile("INSTALL.vcxproj") and "INSTALL.vcxproj" or "INSTALL.vcproj"
     if os.isfile(projfile) then
         msbuild.build(package, {projfile})