Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feat/conan v2 #28

Merged
merged 3 commits into from
Sep 19, 2023
Merged

Feat/conan v2 #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8693f4b
fix(conanfile): Modernize to Conan v2
leha-bot Sep 19, 2023
d9f04ca
fix(tests/CMakeLists.txt): add missing include(doctest)
leha-bot Sep 19, 2023
5838491
fix(ci): modernize to Conan v2
leha-bot Sep 19, 2023
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
8 changes: 6 additions & 2 deletions .github/workflows/cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,22 @@ jobs:
# Install conan
- name: Get Conan
uses: turtlebrowser/[email protected]

# Detect the build profile for futher Conan interactions.
- name: Detect Conan build profile
run: conan profile detect

# Install dependencies in the same build folder as will be used in CMake. This path also will be used for CMake's find_package() mode
# via CMAKE_MODULE_PATH and CMAKE_PREFIX_PATH.
- name: Install dependencies
run: conan install . --build=missing -if ${{github.workspace}}/build -s build_type=${{env.BUILD_TYPE}}
run: conan install . --build=missing -of ${{github.workspace}}/conan-deps -s build_type=${{env.BUILD_TYPE}}

- name: Configure CMake
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
# Also set PREFIX and MODULE paths for find_package() via CMAKE_MODULE_PATH and CMAKE_PREFIX_PATH variables.
# See https://cmake.org/cmake/help/latest/command/find_package.html?highlight=find_package for search modes.
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_PREFIX_PATH=${{github.workspace}}/build -DCMAKE_MODULE_PATH=${{github.workspace}}/build
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_PREFIX_PATH=${{github.workspace}}/conan-deps -DCMAKE_MODULE_PATH=${{github.workspace}}/conan-deps

- name: Build
# Build your program with the given configuration
Expand Down
4 changes: 2 additions & 2 deletions conanfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
[requires]
fmt/8.1.1

[build_requires]
[test_requires]
doctest/2.4.9

[generators]
cmake_find_package_multi
CMakeDeps
2 changes: 2 additions & 0 deletions tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
enable_testing()
find_package(doctest REQUIRED)

include(doctest)

add_executable(lbstd_version_tests test.cpp)
target_link_libraries(lbstd_version_tests doctest::doctest lbstd_version)

Expand Down