diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 92a7bf6..8fe0ce6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,11 +29,13 @@ jobs: environment-file: dev-environment.yml cache-environment: true - - name: Build + - name: Configure CMake run: | - meson setup build - cd build - meson compile + cmake -Bbuild -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX + + - name: Build with CMake + working-directory: build + run: cmake --build . --parallel 8 - name: Smoke test working-directory: build @@ -45,10 +47,3 @@ jobs: run: | pytest -v - - name: Configure CMake - run: | - cmake -Bbuild -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX - - - name: Build with CMake - working-directory: build - run: cmake --build . --parallel 8 diff --git a/README.md b/README.md index 15814c2..a03afe0 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,9 @@ Developer's workflow using `micromamba` to manage the dependencies: ```bash micromamba create -f dev-environment.yml micromamba activate git2cpp-dev -meson setup build +cmake -Bbuild $CMAKE_INSALL_PREFIX=$CONDA_PREFIX cd build -meson compile +make -j8 ``` The `git2cpp` executable can then be run, e.g. `./git2cpp -v`. diff --git a/meson.build b/meson.build deleted file mode 100644 index bb7486f..0000000 --- a/meson.build +++ /dev/null @@ -1,23 +0,0 @@ -project( - 'git2cpp', - 'cpp', - default_options: [ - 'cpp_std=c++20', - #'werror=true', - ], - license: 'BSD-3-Clause', -) - -cli11_dep = dependency('CLI11') -libgit2_dep = dependency('libgit2') - -subdir('src') - -executable( - 'git2cpp', - src_files, - dependencies: [ - cli11_dep, - libgit2_dep, - ], -) diff --git a/src/meson.build b/src/meson.build deleted file mode 100644 index 1e68a2f..0000000 --- a/src/meson.build +++ /dev/null @@ -1,7 +0,0 @@ -subdir('subcommand') -subdir('utils') -subdir('wrapper') - -src_files = files([ - 'main.cpp' -]) + subcommand_files + utils_files + wrapper_files diff --git a/src/subcommand/meson.build b/src/subcommand/meson.build deleted file mode 100644 index 66cb1b2..0000000 --- a/src/subcommand/meson.build +++ /dev/null @@ -1,4 +0,0 @@ -subcommand_files = files([ - 'init_subcommand.cpp', - 'status_subcommand.cpp', -]) diff --git a/src/wrapper/meson.build b/src/wrapper/meson.build deleted file mode 100644 index 95843ff..0000000 --- a/src/wrapper/meson.build +++ /dev/null @@ -1,5 +0,0 @@ -wrapper_files = files([ - 'refs_wrapper.cpp', - 'repository_wrapper.cpp', - 'status_wrapper.cpp', -])