Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
project(watchman_cpp)

set(CMAKE_CXX_STANDARD 20)

set(BUILD_SHARED_LIBS FALSE)

set(CMAKE_CXX_FLAGS
"${CMAKE_CXX_FLAGS} -Wno-template-body")

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
## Сборка проекта
Для сборки прокета необходимо:

— установить в систему библиотеки: fmt, boost 1.66 или выше, curl;
— установить в систему библиотеки: boost 1.66 или выше, curl;

— обновить самбодули:
```shell
Expand Down
2 changes: 2 additions & 0 deletions accomodation/build_rpm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@ sh accomodation/build_rpm/docker_run.sh
+ exit 0
```
После этого в папке accomodation/build_rpm появится папка **RPMS** с артефактами сборки.

В `docker_run.sh` при монтировании тома используется флаг `z` для SELinux. Он чинит ошибку доступа при обращении из контейнера к `/mnt/watchman_cpp/accomodation/build_rpm/build_rpm.sh`. Если вы не используете механизм SELinux, можете этот флаг убрать.
2 changes: 1 addition & 1 deletion accomodation/build_rpm/docker_run.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash

docker run -it \
-v $(pwd)/../..:/mnt/watchman_cpp \
-v $(pwd)/../..:/mnt/watchman_cpp:z \
watchman_cpp_rpm