From 18f1eb56bd7a40bd28a846fb468260be2643804c Mon Sep 17 00:00:00 2001 From: "Christopher A. Mosher" Date: Fri, 4 Nov 2022 11:11:42 -0400 Subject: [PATCH] use cmake to build roms, too; it just calls existing makefile --- .github/workflows/build.yaml | 8 +++++--- CMakeLists.txt | 1 + rom/CMakeLists.txt | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 rom/CMakeLists.txt diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2694b1b..5f9ca44 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -21,11 +21,13 @@ jobs: - uses: "actions/checkout@v3" - - name: "Build artifacts" + - name: "Build" run: | set -x - cd rom - make + mkdir build + cd build + cmake .. + cmake --build . --target roms - uses: "actions/upload-artifact@v3" with: diff --git a/CMakeLists.txt b/CMakeLists.txt index a467817..1bb3aaf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,3 +8,4 @@ include(GNUInstallDirs) add_subdirectory(src) add_subdirectory(conf) +add_subdirectory(rom) diff --git a/rom/CMakeLists.txt b/rom/CMakeLists.txt new file mode 100644 index 0000000..f6d3ec2 --- /dev/null +++ b/rom/CMakeLists.txt @@ -0,0 +1 @@ +add_custom_target(roms COMMAND make WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})