Skip to content

Commit 6ce0f91

Browse files
committed
XMake 增加输出当前使用的构建工具的流程;CI 命令改为先创建 build 路径再运行指令
1 parent 3c1bb9c commit 6ce0f91

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.github/workflows/build_and_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
run: rm -r build
2727

2828
- name: XMake config
29-
run: xmake f --EMDEVIF_TEST_FRAMEWORK_ENABLE_TEST=true --EMDEVIF_TEST_FRAMEWORK_TEST_NAME="integration_test" --verbose
29+
run: mkdir build && xmake f -m release --EMDEVIF_TEST_FRAMEWORK_ENABLE_TEST=true --EMDEVIF_TEST_FRAMEWORK_TEST_NAME="integration_test" --verbose
3030
- name: XMake build
3131
run: xmake --build --verbose emdevif_test_framework_test
3232
- name: XMake run test

test/xmake.lua

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,11 @@ target("emdevif_test_framework_test", function ()
3232
cygwin = "Unix Makefiles"
3333
}
3434
generator = XMAKE_GENERATOR_TO_CMAKE[generator]
35-
generator = " -G " .. generator
35+
generator = " -G \"" .. generator .. "\""
3636
end
3737

38+
target_name = target:name()
39+
printf("[%s]: Generator for CMake is \"%s\"", target_name, generator)
3840
os.exec("cmake -S ." .. generator .. " "
3941
.. " -DEMDEVIF_TEST_FRAMEWORK_ENABLE_TEST=ON "
4042
.. "-DEMDEVIF_TEST_FRAMEWORK_TEST_NAME=" .. test_name .. " "

0 commit comments

Comments
 (0)