Skip to content

Commit 90a95da

Browse files
committed
fix cmake
1 parent 3be4166 commit 90a95da

File tree

6 files changed

+10
-8
lines changed

6 files changed

+10
-8
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
build/
22
__pycache__/
3+
.cache/
4+
compile_commands.json

CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ find_package(libgit2)
3939
# =====
4040

4141
set(GIT2CPP_SRC
42+
${GIT2CPP_SOURCE_DIR}/subcommand/add_subcommand.cpp
43+
${GIT2CPP_SOURCE_DIR}/subcommand/add_subcommand.hpp
4244
${GIT2CPP_SOURCE_DIR}/subcommand/init_subcommand.cpp
4345
${GIT2CPP_SOURCE_DIR}/subcommand/init_subcommand.hpp
4446
${GIT2CPP_SOURCE_DIR}/subcommand/status_subcommand.cpp
@@ -47,6 +49,8 @@ set(GIT2CPP_SRC
4749
${GIT2CPP_SOURCE_DIR}/utils/common.hpp
4850
${GIT2CPP_SOURCE_DIR}/utils/git_exception.cpp
4951
${GIT2CPP_SOURCE_DIR}/utils/git_exception.hpp
52+
${GIT2CPP_SOURCE_DIR}/wrapper/index_wrapper.cpp
53+
${GIT2CPP_SOURCE_DIR}/wrapper/index_wrapper.hpp
5054
${GIT2CPP_SOURCE_DIR}/wrapper/refs_wrapper.cpp
5155
${GIT2CPP_SOURCE_DIR}/wrapper/refs_wrapper.hpp
5256
${GIT2CPP_SOURCE_DIR}/wrapper/repository_wrapper.cpp
@@ -59,4 +63,3 @@ set(GIT2CPP_SRC
5963

6064
add_executable(git2cpp ${GIT2CPP_SRC})
6165
target_link_libraries(git2cpp PRIVATE libgit2::libgit2package)
62-

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Developer's workflow using `micromamba` to manage the dependencies:
1313
```bash
1414
micromamba create -f dev-environment.yml
1515
micromamba activate git2cpp-dev
16-
cmake -Bbuild $CMAKE_INSALL_PREFIX=$CONDA_PREFIX
16+
cmake -Bbuild -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX
1717
cd build
1818
make -j8
1919
```

dev-environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ channels:
44
dependencies:
55
- cli11
66
- libgit2
7-
- meson
7+
- cmake
88
- pkg-config
99
- python
1010
- pytest

src/utils/meson.build

Lines changed: 0 additions & 4 deletions
This file was deleted.

src/wrapper/repository_wrapper.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,6 @@ repository_wrapper repository_wrapper::init(const std::string& directory, bool b
2424
index_wrapper repository_wrapper::get_index() const
2525
{
2626
repository_wrapper rw;
27-
index_wrapper::init(rw);
27+
index_wrapper index = index_wrapper::init(rw);
28+
return index;
2829
}

0 commit comments

Comments
 (0)