Skip to content

Commit

Permalink
Create separate folder for dependency files
Browse files Browse the repository at this point in the history
  • Loading branch information
Volodymyr Chernetskyi committed Oct 6, 2020
1 parent 9d25c19 commit f4dfdd1
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

- name: Install dependencies
run: |
[[ -r apt_packages.txt ]] && sed 's/\r$//' apt_packages.txt | sed 's/#.*//' | xargs sudo apt-get install -y
[[ -r dependencies/apt.txt ]] && sed 's/#.*//' dependencies/apt.txt | xargs sudo apt-get install -y
- name: Configure
run: CC=${{ matrix.cc }} CXX=${{ matrix.cxx }} cmake -DENABLE_CONAN=OFF -Bbuild
Expand Down
9 changes: 6 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,21 @@
- **C++ compiler** - needs to support **C++17** standard
- **CMake** 3.15+

The rest prerequisites (such as development libraries) can be found in the [packages file](./apt_packages.txt) in the form of the apt package manager package names.
Dependencies (such as development libraries) can be found in the [dependencies folder](./dependencies) in the form of the text files with package names for different package managers.

## Installing

1. Clone the project.
```bash
git clone [email protected]:chernetskyi/cpp-template.git
```
2. Install required packages. On Ubuntu:
2. Install required packages.

On Ubuntu:
```bash
[[ -r apt_packages.txt ]] && sed 's/\r$//' apt_packages.txt | sed 's/#.*//' | xargs sudo apt-get install -y
[[ -r dependencies/apt.txt ]] && sed 's/#.*//' dependencies/apt.txt| xargs sudo apt-get install -y
```
Use Conan on Windows.
3. Build.
```bash
cmake -Bbuild
Expand Down
2 changes: 1 addition & 1 deletion cmake/defaults/Conan.cmake
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
if (ENABLE_CONAN)
include(cmake/extra/conan.cmake)
conan_cmake_run(CONANFILE conanfile.txt
conan_cmake_run(CONANFILE dependencies/conanfile.txt
BASIC_SETUP CMAKE_TARGETS
BUILD missing)
endif ()
File renamed without changes.
File renamed without changes.

0 comments on commit f4dfdd1

Please sign in to comment.