From 2474619ad67c5c48baff4f4547b903b4732865cf Mon Sep 17 00:00:00 2001 From: Niket Naidu Date: Sun, 12 Dec 2021 19:12:06 -0800 Subject: [PATCH 01/14] Added initial hybrid single project --- CMakeLists.txt | 1 + example/hybrid/single/.gitignore | 10 +++ example/hybrid/single/CMakeLists.txt | 29 +++++++ example/hybrid/single/build.cpp | 125 +++++++++++++++++++++++++++ example/hybrid/single/build.toml | 12 +++ example/hybrid/single/src/main.cpp | 6 ++ 6 files changed, 183 insertions(+) create mode 100644 example/hybrid/single/.gitignore create mode 100644 example/hybrid/single/CMakeLists.txt create mode 100644 example/hybrid/single/build.cpp create mode 100644 example/hybrid/single/build.toml create mode 100644 example/hybrid/single/src/main.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index e1f660af..992be79d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,6 +106,7 @@ if (${BUILDCC_INSTALL}) endif() if (${BUILDCC_EXAMPLES}) + add_subdirectory(example/hybrid) add_subdirectory(example/hybrid/simple) add_subdirectory(example/hybrid/foolib) add_subdirectory(example/hybrid/external_lib) diff --git a/example/hybrid/single/.gitignore b/example/hybrid/single/.gitignore new file mode 100644 index 00000000..cb283a9c --- /dev/null +++ b/example/hybrid/single/.gitignore @@ -0,0 +1,10 @@ +# Folder +generated +buildcc +_internal* + +# Files +*.exe +*.o +*.bin +*.dot diff --git a/example/hybrid/single/CMakeLists.txt b/example/hybrid/single/CMakeLists.txt new file mode 100644 index 00000000..63bac120 --- /dev/null +++ b/example/hybrid/single/CMakeLists.txt @@ -0,0 +1,29 @@ +cmake_minimum_required(VERSION 3.10.0) +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_EXPORT_COMPILE_COMMANDS ON) +project(hybrid_single_example) + +# Bootstrap your build file using CMake +add_executable(hybrid_single_example build.cpp) +target_link_libraries(hybrid_single_example PRIVATE buildcc) +# target_compile_options(hybrid_single_example PRIVATE -Og -g) +# target_link_options(hybrid_single_example PRIVATE -g) + +# TODO, Add this only if MINGW is used +# https://github.com/msys2/MINGW-packages/issues/2303 +# Similar issue when adding the Taskflow library +if (${MINGW}) + message(WARNING "-Wl,--allow-multiple-definition for MINGW") + target_link_options(hybrid_single_example PRIVATE -Wl,--allow-multiple-definition) +endif() + +# Run your build file +add_custom_target(run_hybrid_single_example + COMMAND hybrid_single_example --help-all + COMMAND hybrid_single_example --config ${CMAKE_CURRENT_SOURCE_DIR}/build_win.toml + # COMMAND dot -Tpng graph.dot -o graph.PNG + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + DEPENDS hybrid_single_example buildcc + VERBATIM USES_TERMINAL +) diff --git a/example/hybrid/single/build.cpp b/example/hybrid/single/build.cpp new file mode 100644 index 00000000..55d43289 --- /dev/null +++ b/example/hybrid/single/build.cpp @@ -0,0 +1,125 @@ +#include "buildcc.h" + +#include "fmt/format.h" + +using namespace buildcc; + +constexpr const char *const EXE = "build"; + +// Function Prototypes +static void clean_cb(); +static void cppflags_build_cb(base::Target &cppflags); +static void cflags_build_cb(base::Target &cflags); + +int main(int argc, char **argv) { + // 1. Get arguments + Args args; + ArgToolchain arg_gcc; + ArgToolchain arg_msvc; + args.AddToolchain("gcc", "Generic gcc toolchain", arg_gcc); + args.AddToolchain("msvc", "Generic msvc toolchain", arg_msvc); + args.Parse(argc, argv); + + // 2. Initialize your environment + Register reg(args); + + // 3. Pre-build steps + reg.Clean(clean_cb); + + // 4. Build steps + // Explicit toolchain - target pairs + Toolchain_gcc gcc; + Toolchain_msvc msvc; + + ExecutableTarget_gcc g_cppflags("cppflags", gcc, "files"); + ExecutableTarget_msvc m_cppflags("cppflags", msvc, "files"); + ExecutableTarget_gcc g_cflags("cflags", gcc, "files"); + ExecutableTarget_msvc m_cflags("cflags", msvc, "files"); + + // Select your builds and tests using the .toml files + reg.Build(arg_gcc.state, cppflags_build_cb, g_cppflags); + reg.Build(arg_msvc.state, cppflags_build_cb, m_cppflags); + reg.Build(arg_gcc.state, cflags_build_cb, g_cflags); + reg.Build(arg_msvc.state, cflags_build_cb, m_cflags); + + // 5. Test steps + // NOTE, For now they are just dummy callbacks + reg.Test(arg_gcc.state, "{executable}", g_cppflags); + reg.Test(arg_msvc.state, "{executable}", m_cppflags); + reg.Test(arg_gcc.state, "{executable}", g_cflags); + reg.Test(arg_msvc.state, "{executable}", m_cflags); + + // 6. Build Target + reg.RunBuild(); + + // 7. Test Target + reg.RunTest(); + + // 8. Post Build steps + + // - Clang Compile Commands + plugin::ClangCompileCommands({&g_cflags, &g_cppflags, &m_cflags, &m_cppflags}) + .Generate(); + + // - Plugin Graph + std::string output = reg.GetTaskflow().dump(); + const bool saved = env::save_file("graph.dot", output, false); + env::assert_fatal(saved, "Could not save graph.dot file"); + + return 0; +} + +static void clean_cb() { + env::log_info(EXE, fmt::format("Cleaning {}", env::get_project_build_dir())); + fs::remove_all(env::get_project_build_dir()); +} + +static void cppflags_build_cb(base::Target &cppflags) { + cppflags.AddSource("main.cpp", "src"); + cppflags.AddSource("src/random.cpp"); + cppflags.AddIncludeDir("include", true); + + // Toolchain specific code goes here + switch (cppflags.GetToolchain().GetId()) { + case base::Toolchain::Id::Gcc: { + cppflags.AddPreprocessorFlag("-DRANDOM=1"); + cppflags.AddCppCompileFlag("-Wall"); + cppflags.AddCppCompileFlag("-Werror"); + cppflags.AddLinkFlag("-lm"); + break; + } + case base::Toolchain::Id::Msvc: { + cppflags.AddPreprocessorFlag("/DRANDOM=1"); + cppflags.AddCppCompileFlag("/W4"); + break; + } + default: + break; + } + + cppflags.Build(); +} + +static void cflags_build_cb(base::Target &cflags) { + cflags.AddSource("main.c", "src"); + + // Toolchain specific code goes here + switch (cflags.GetToolchain().GetId()) { + case base::Toolchain::Id::Gcc: { + cflags.AddPreprocessorFlag("-DRANDOM=1"); + cflags.AddCCompileFlag("-Wall"); + cflags.AddCCompileFlag("-Werror"); + cflags.AddLinkFlag("-lm"); + break; + } + case base::Toolchain::Id::Msvc: { + cflags.AddPreprocessorFlag("/DRANDOM=1"); + cflags.AddCCompileFlag("/W4"); + break; + } + default: + break; + } + + cflags.Build(); +} diff --git a/example/hybrid/single/build.toml b/example/hybrid/single/build.toml new file mode 100644 index 00000000..a18f5c22 --- /dev/null +++ b/example/hybrid/single/build.toml @@ -0,0 +1,12 @@ +# Root +root_dir = "" +build_dir = "_internal_linux" +loglevel = "trace" + +# Project +clean = true + +# Toolchain +[toolchain.gcc] +build = true +test = true diff --git a/example/hybrid/single/src/main.cpp b/example/hybrid/single/src/main.cpp new file mode 100644 index 00000000..147d50de --- /dev/null +++ b/example/hybrid/single/src/main.cpp @@ -0,0 +1,6 @@ +#include + +int main() { + std::cout << "Hello World" << std::endl; + return 0; +} From 858046209a9331a7907027bc91bb57f3620d3715 Mon Sep 17 00:00:00 2001 From: Niket Naidu Date: Sun, 12 Dec 2021 19:12:54 -0800 Subject: [PATCH 02/14] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 992be79d..68e47918 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,7 +106,7 @@ if (${BUILDCC_INSTALL}) endif() if (${BUILDCC_EXAMPLES}) - add_subdirectory(example/hybrid) + add_subdirectory(example/hybrid/single) add_subdirectory(example/hybrid/simple) add_subdirectory(example/hybrid/foolib) add_subdirectory(example/hybrid/external_lib) From 2e41cd412ed6494c87a09051fdf1ca28131153f6 Mon Sep 17 00:00:00 2001 From: Niket Naidu Date: Sun, 12 Dec 2021 19:12:57 -0800 Subject: [PATCH 03/14] Update CMakeLists.txt --- example/hybrid/single/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/example/hybrid/single/CMakeLists.txt b/example/hybrid/single/CMakeLists.txt index 63bac120..ce23965a 100644 --- a/example/hybrid/single/CMakeLists.txt +++ b/example/hybrid/single/CMakeLists.txt @@ -7,8 +7,6 @@ project(hybrid_single_example) # Bootstrap your build file using CMake add_executable(hybrid_single_example build.cpp) target_link_libraries(hybrid_single_example PRIVATE buildcc) -# target_compile_options(hybrid_single_example PRIVATE -Og -g) -# target_link_options(hybrid_single_example PRIVATE -g) # TODO, Add this only if MINGW is used # https://github.com/msys2/MINGW-packages/issues/2303 From 00bb96f6d42f2cb104778ecb589b1276aa52755c Mon Sep 17 00:00:00 2001 From: Niket Naidu Date: Sun, 12 Dec 2021 19:16:46 -0800 Subject: [PATCH 04/14] Update build.cpp --- example/hybrid/single/build.cpp | 69 +-------------------------------- 1 file changed, 1 insertion(+), 68 deletions(-) diff --git a/example/hybrid/single/build.cpp b/example/hybrid/single/build.cpp index 55d43289..80125979 100644 --- a/example/hybrid/single/build.cpp +++ b/example/hybrid/single/build.cpp @@ -1,7 +1,5 @@ #include "buildcc.h" -#include "fmt/format.h" - using namespace buildcc; constexpr const char *const EXE = "build"; @@ -9,15 +7,12 @@ constexpr const char *const EXE = "build"; // Function Prototypes static void clean_cb(); static void cppflags_build_cb(base::Target &cppflags); -static void cflags_build_cb(base::Target &cflags); int main(int argc, char **argv) { // 1. Get arguments Args args; ArgToolchain arg_gcc; - ArgToolchain arg_msvc; args.AddToolchain("gcc", "Generic gcc toolchain", arg_gcc); - args.AddToolchain("msvc", "Generic msvc toolchain", arg_msvc); args.Parse(argc, argv); // 2. Initialize your environment @@ -29,25 +24,13 @@ int main(int argc, char **argv) { // 4. Build steps // Explicit toolchain - target pairs Toolchain_gcc gcc; - Toolchain_msvc msvc; - ExecutableTarget_gcc g_cppflags("cppflags", gcc, "files"); - ExecutableTarget_msvc m_cppflags("cppflags", msvc, "files"); - ExecutableTarget_gcc g_cflags("cflags", gcc, "files"); - ExecutableTarget_msvc m_cflags("cflags", msvc, "files"); // Select your builds and tests using the .toml files reg.Build(arg_gcc.state, cppflags_build_cb, g_cppflags); - reg.Build(arg_msvc.state, cppflags_build_cb, m_cppflags); - reg.Build(arg_gcc.state, cflags_build_cb, g_cflags); - reg.Build(arg_msvc.state, cflags_build_cb, m_cflags); // 5. Test steps - // NOTE, For now they are just dummy callbacks reg.Test(arg_gcc.state, "{executable}", g_cppflags); - reg.Test(arg_msvc.state, "{executable}", m_cppflags); - reg.Test(arg_gcc.state, "{executable}", g_cflags); - reg.Test(arg_msvc.state, "{executable}", m_cflags); // 6. Build Target reg.RunBuild(); @@ -58,13 +41,7 @@ int main(int argc, char **argv) { // 8. Post Build steps // - Clang Compile Commands - plugin::ClangCompileCommands({&g_cflags, &g_cppflags, &m_cflags, &m_cppflags}) - .Generate(); - - // - Plugin Graph - std::string output = reg.GetTaskflow().dump(); - const bool saved = env::save_file("graph.dot", output, false); - env::assert_fatal(saved, "Could not save graph.dot file"); + plugin::ClangCompileCommands({&g_cppflags}).Generate(); return 0; } @@ -76,50 +53,6 @@ static void clean_cb() { static void cppflags_build_cb(base::Target &cppflags) { cppflags.AddSource("main.cpp", "src"); - cppflags.AddSource("src/random.cpp"); - cppflags.AddIncludeDir("include", true); - - // Toolchain specific code goes here - switch (cppflags.GetToolchain().GetId()) { - case base::Toolchain::Id::Gcc: { - cppflags.AddPreprocessorFlag("-DRANDOM=1"); - cppflags.AddCppCompileFlag("-Wall"); - cppflags.AddCppCompileFlag("-Werror"); - cppflags.AddLinkFlag("-lm"); - break; - } - case base::Toolchain::Id::Msvc: { - cppflags.AddPreprocessorFlag("/DRANDOM=1"); - cppflags.AddCppCompileFlag("/W4"); - break; - } - default: - break; - } cppflags.Build(); } - -static void cflags_build_cb(base::Target &cflags) { - cflags.AddSource("main.c", "src"); - - // Toolchain specific code goes here - switch (cflags.GetToolchain().GetId()) { - case base::Toolchain::Id::Gcc: { - cflags.AddPreprocessorFlag("-DRANDOM=1"); - cflags.AddCCompileFlag("-Wall"); - cflags.AddCCompileFlag("-Werror"); - cflags.AddLinkFlag("-lm"); - break; - } - case base::Toolchain::Id::Msvc: { - cflags.AddPreprocessorFlag("/DRANDOM=1"); - cflags.AddCCompileFlag("/W4"); - break; - } - default: - break; - } - - cflags.Build(); -} From d07a5f22122d2d055800a3d9d2095eead5338d03 Mon Sep 17 00:00:00 2001 From: Niket Naidu Date: Sun, 12 Dec 2021 19:18:07 -0800 Subject: [PATCH 05/14] Update build.cpp --- example/hybrid/single/build.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/example/hybrid/single/build.cpp b/example/hybrid/single/build.cpp index 80125979..851891c6 100644 --- a/example/hybrid/single/build.cpp +++ b/example/hybrid/single/build.cpp @@ -24,13 +24,13 @@ int main(int argc, char **argv) { // 4. Build steps // Explicit toolchain - target pairs Toolchain_gcc gcc; - ExecutableTarget_gcc g_cppflags("cppflags", gcc, "files"); + ExecutableTarget_gcc hello_world("hello_world", gcc, "files"); // Select your builds and tests using the .toml files - reg.Build(arg_gcc.state, cppflags_build_cb, g_cppflags); + reg.Build(arg_gcc.state, cppflags_build_cb, hello_world); // 5. Test steps - reg.Test(arg_gcc.state, "{executable}", g_cppflags); + reg.Test(arg_gcc.state, "{executable}", hello_world); // 6. Build Target reg.RunBuild(); @@ -39,9 +39,8 @@ int main(int argc, char **argv) { reg.RunTest(); // 8. Post Build steps - // - Clang Compile Commands - plugin::ClangCompileCommands({&g_cppflags}).Generate(); + plugin::ClangCompileCommands({&hello_world}).Generate(); return 0; } From 6d6674884baecd7c719e82b0681b88f55f9d70f4 Mon Sep 17 00:00:00 2001 From: Niket Naidu Date: Sun, 12 Dec 2021 19:19:09 -0800 Subject: [PATCH 06/14] Update CMakeLists.txt --- example/hybrid/single/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/hybrid/single/CMakeLists.txt b/example/hybrid/single/CMakeLists.txt index ce23965a..f5e60dca 100644 --- a/example/hybrid/single/CMakeLists.txt +++ b/example/hybrid/single/CMakeLists.txt @@ -19,7 +19,7 @@ endif() # Run your build file add_custom_target(run_hybrid_single_example COMMAND hybrid_single_example --help-all - COMMAND hybrid_single_example --config ${CMAKE_CURRENT_SOURCE_DIR}/build_win.toml + COMMAND hybrid_single_example --config ${CMAKE_CURRENT_SOURCE_DIR}/build.toml # COMMAND dot -Tpng graph.dot -o graph.PNG WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS hybrid_single_example buildcc From 1fc311bfd04ebf89e1e416b94cd2c101eab12c7b Mon Sep 17 00:00:00 2001 From: Niket Naidu Date: Sun, 12 Dec 2021 19:19:12 -0800 Subject: [PATCH 07/14] Update build.cpp --- example/hybrid/single/build.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/hybrid/single/build.cpp b/example/hybrid/single/build.cpp index 851891c6..f2e65f67 100644 --- a/example/hybrid/single/build.cpp +++ b/example/hybrid/single/build.cpp @@ -24,7 +24,7 @@ int main(int argc, char **argv) { // 4. Build steps // Explicit toolchain - target pairs Toolchain_gcc gcc; - ExecutableTarget_gcc hello_world("hello_world", gcc, "files"); + ExecutableTarget_gcc hello_world("hello_world", gcc, ""); // Select your builds and tests using the .toml files reg.Build(arg_gcc.state, cppflags_build_cb, hello_world); From 327d19a4d9ca8ea946e78ab5c4c7baf374833691 Mon Sep 17 00:00:00 2001 From: Niket Naidu Date: Sun, 12 Dec 2021 19:20:17 -0800 Subject: [PATCH 08/14] Update build.toml --- example/hybrid/single/build.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/hybrid/single/build.toml b/example/hybrid/single/build.toml index a18f5c22..d849a6ef 100644 --- a/example/hybrid/single/build.toml +++ b/example/hybrid/single/build.toml @@ -1,6 +1,6 @@ # Root root_dir = "" -build_dir = "_internal_linux" +build_dir = "_build" loglevel = "trace" # Project From fc60cd035d2b460aa94694c75b07a8d9a4784c19 Mon Sep 17 00:00:00 2001 From: Niket Naidu Date: Sun, 12 Dec 2021 19:21:07 -0800 Subject: [PATCH 09/14] Update build.cpp --- example/hybrid/single/build.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/example/hybrid/single/build.cpp b/example/hybrid/single/build.cpp index f2e65f67..8166a62d 100644 --- a/example/hybrid/single/build.cpp +++ b/example/hybrid/single/build.cpp @@ -6,7 +6,7 @@ constexpr const char *const EXE = "build"; // Function Prototypes static void clean_cb(); -static void cppflags_build_cb(base::Target &cppflags); +static void hello_world_build_cb(BaseTarget &target); int main(int argc, char **argv) { // 1. Get arguments @@ -27,7 +27,7 @@ int main(int argc, char **argv) { ExecutableTarget_gcc hello_world("hello_world", gcc, ""); // Select your builds and tests using the .toml files - reg.Build(arg_gcc.state, cppflags_build_cb, hello_world); + reg.Build(arg_gcc.state, hello_world_build_cb, hello_world); // 5. Test steps reg.Test(arg_gcc.state, "{executable}", hello_world); @@ -50,8 +50,8 @@ static void clean_cb() { fs::remove_all(env::get_project_build_dir()); } -static void cppflags_build_cb(base::Target &cppflags) { - cppflags.AddSource("main.cpp", "src"); +static void hello_world_build_cb(BaseTarget &target) { + target.AddSource("main.cpp", "src"); - cppflags.Build(); + target.Build(); } From d3a108887f1360ce10d8ffd5d8d2987d47dbd8d4 Mon Sep 17 00:00:00 2001 From: Niket Naidu Date: Sun, 12 Dec 2021 19:42:14 -0800 Subject: [PATCH 10/14] Update build.cpp --- example/hybrid/single/build.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/example/hybrid/single/build.cpp b/example/hybrid/single/build.cpp index 8166a62d..a3d00858 100644 --- a/example/hybrid/single/build.cpp +++ b/example/hybrid/single/build.cpp @@ -25,6 +25,8 @@ int main(int argc, char **argv) { // Explicit toolchain - target pairs Toolchain_gcc gcc; ExecutableTarget_gcc hello_world("hello_world", gcc, ""); + auto verified_toolchains = gcc.Verify(); + env::assert_fatal(!verified_toolchains.empty(), "GCC Toolchain not found"); // Select your builds and tests using the .toml files reg.Build(arg_gcc.state, hello_world_build_cb, hello_world); From a66a9517f242983864cebe85cf5161250ee80c20 Mon Sep 17 00:00:00 2001 From: Niket Naidu Date: Sun, 12 Dec 2021 19:45:42 -0800 Subject: [PATCH 11/14] Update linux_gcc_cmake_build.yml --- .github/workflows/linux_gcc_cmake_build.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/linux_gcc_cmake_build.yml b/.github/workflows/linux_gcc_cmake_build.yml index 304f38a2..619360c1 100644 --- a/.github/workflows/linux_gcc_cmake_build.yml +++ b/.github/workflows/linux_gcc_cmake_build.yml @@ -91,6 +91,11 @@ jobs: cmake --build build --parallel 2 --config Release ./build/Release/build + - name: Hybrid Single Example + working-directory: ${{github.workspace}}/${{env.BUILD_FOLDER_DEV_ALL}} + run: | + cmake --build . --target run_hybrid_single_example --config Release + - name: Hybrid Simple Example working-directory: ${{github.workspace}}/${{env.BUILD_FOLDER_DEV_ALL}} run: | @@ -214,6 +219,11 @@ jobs: cmake --build build --parallel 2 --config Release ./build/Release/build + - name: Hybrid Single Example + working-directory: ${{github.workspace}}/${{env.BUILD_FOLDER_DEV_SINGLE}} + run: | + cmake --build . --target run_hybrid_simple_example --config Release + - name: Hybrid Simple Example working-directory: ${{github.workspace}}/${{env.BUILD_FOLDER_DEV_SINGLE}} run: | From 3b4fed8c99ce5686dbb3070577a1d74ddc35b0e3 Mon Sep 17 00:00:00 2001 From: Niket Naidu Date: Sun, 12 Dec 2021 19:46:24 -0800 Subject: [PATCH 12/14] Update README.md --- example/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/example/README.md b/example/README.md index ad046da9..eafe6468 100644 --- a/example/README.md +++ b/example/README.md @@ -108,6 +108,8 @@ Multi hosts and multi targets **Current state of examples** +- [x] Single + - Compile a single source with `Register` and `Args` module - [x] Simple - Similar to Flags example with `Register` and `Args` module - [x] Foolib From a4a87516b53740bb656adf7d215ba5525463deea Mon Sep 17 00:00:00 2001 From: Niket Naidu Date: Sun, 12 Dec 2021 19:50:51 -0800 Subject: [PATCH 13/14] Update linux_gcc_cmake_build.yml --- .github/workflows/linux_gcc_cmake_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux_gcc_cmake_build.yml b/.github/workflows/linux_gcc_cmake_build.yml index 619360c1..e694565d 100644 --- a/.github/workflows/linux_gcc_cmake_build.yml +++ b/.github/workflows/linux_gcc_cmake_build.yml @@ -222,7 +222,7 @@ jobs: - name: Hybrid Single Example working-directory: ${{github.workspace}}/${{env.BUILD_FOLDER_DEV_SINGLE}} run: | - cmake --build . --target run_hybrid_simple_example --config Release + cmake --build . --target run_hybrid_single_example --config Release - name: Hybrid Simple Example working-directory: ${{github.workspace}}/${{env.BUILD_FOLDER_DEV_SINGLE}} From 8f88dc05e18363ba90a7efb4192bb84d86e61d29 Mon Sep 17 00:00:00 2001 From: Niket Naidu Date: Sun, 12 Dec 2021 19:52:24 -0800 Subject: [PATCH 14/14] Update win_cmake_build.yml --- .github/workflows/win_cmake_build.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/win_cmake_build.yml b/.github/workflows/win_cmake_build.yml index 7a898da1..badc6173 100644 --- a/.github/workflows/win_cmake_build.yml +++ b/.github/workflows/win_cmake_build.yml @@ -88,6 +88,11 @@ jobs: ls .\build.exe + - name: Hybrid Single Example + working-directory: ${{github.workspace}}/${{env.BUILD_FOLDER_MSVC_DEV_ALL}} + run: | + cmake --build . --config Release --parallel 2 --target run_hybrid_single_example + - name: Hybrid Simple Example working-directory: ${{github.workspace}}/${{env.BUILD_FOLDER_MSVC_DEV_ALL}} run: | @@ -178,6 +183,11 @@ jobs: ls .\build.exe + - name: Hybrid Single Example + working-directory: ${{github.workspace}}/${{env.BUILD_FOLDER_CLANG_DEV_ALL}} + run: | + cmake --build . --target run_hybrid_single_example --config Release + - name: Hybrid Simple Example working-directory: ${{github.workspace}}/${{env.BUILD_FOLDER_CLANG_DEV_ALL}} run: |