diff options
| author | ruki <[email protected]> | 2024-10-15 21:13:07 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-10-15 21:13:07 +0800 |
| commit | e5ffc551c65544e9b0db7abf275290116d048afa (patch) | |
| tree | c584ed84989209eea2a3b1d45006470a527aa08c | |
| parent | 794b3c0f5ed3e77add8119f37c638b4fecafacd6 (diff) | |
| parent | ed581b12005d60120381c9d3a6da63ea70eb769d (diff) | |
Merge pull request #5718 from wsw0108/opt-to-msbuild
pass opt to tools/msbuild in tools/cmake
| -rw-r--r-- | xmake/modules/package/tools/cmake.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua index 8ee305a99..2528ec25b 100644 --- a/xmake/modules/package/tools/cmake.lua +++ b/xmake/modules/package/tools/cmake.lua @@ -1007,7 +1007,7 @@ end function _build_for_msvc(package, configs, opt) 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"}) + msbuild.build(package, {allbuild, "-t:Rebuild"}, opt) end -- do build for make @@ -1080,10 +1080,10 @@ end function _install_for_msvc(package, configs, opt) 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"}) + msbuild.build(package, {allbuild, "-t:Rebuild", "/nr:false"}, opt) local projfile = os.isfile("INSTALL.vcxproj") and "INSTALL.vcxproj" or "INSTALL.vcproj" if os.isfile(projfile) then - msbuild.build(package, {projfile}) + msbuild.build(package, {projfile}, opt) os.trycp("install/bin", package:installdir()) os.trycp("install/lib", package:installdir()) -- perhaps only headers library os.trycp("install/share", package:installdir()) |