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: support conan 2 #249

Merged
merged 10 commits into from
Feb 25, 2024
Merged

feat: support conan 2 #249

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f52a33e
Add initial support for conan 2.0
FeignClaims Feb 23, 2024
b456353
Add test
FeignClaims Feb 23, 2024
13082a4
Allow customization of conan 2.0
FeignClaims Feb 23, 2024
df7b2eb
Force invoking conan to improve user experience
FeignClaims Feb 24, 2024
1d0dda4
Make the dummy find_package invoking conan quiet
FeignClaims Feb 24, 2024
442443c
Specify conan version in setup-cpp
FeignClaims Feb 25, 2024
0aad184
Generalize conan 1 and conan 2
FeignClaims Feb 25, 2024
62ab78a
Update documentation based on the generalization fo conan 1 and 2
FeignClaims Feb 25, 2024
24b9ab5
typo: Keep syntax consistency in message [skip ci]
FeignClaims Feb 25, 2024
eecc2d1
Add run_conan in examples [skip ci]
FeignClaims Feb 25, 2024
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
Prev Previous commit
Next Next commit
Add test
  • Loading branch information
@FeignClaims
FeignClaims committed Feb 23, 2024
commit b4563533c6c64ad342ad88328dffd5417205330f
6 changes: 5 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,16 @@ jobs:
cmake: ${{ matrix.cmake }}
ninja: true
vcpkg: true
conan: true
conan: false
FeignClaims marked this conversation as resolved.
Show resolved Hide resolved
cppcheck: true
clangtidy: true
task: true
doxygen: ${{ !contains(matrix.os, 'macos-11') }}

- name: Install conan2
run: |
pip3 install conan==2.1.0

- name: Test
if: ${{ !cancelled() }}
run: |
Expand Down
2 changes: 1 addition & 1 deletion tests/install/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ cmake_minimum_required(VERSION 3.16...3.21)
include(../../src/Index.cmake)

run_vcpkg()
run_conan2()

project(anotherproj VERSION 0.1.0 LANGUAGES CXX C)

# Initialize project_options
project_options(
ENABLE_CACHE
ENABLE_CONAN
# WARNINGS_AS_ERRORS
ENABLE_CPPCHECK
ENABLE_CLANG_TIDY
Expand Down
2 changes: 1 addition & 1 deletion tests/install/conanfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
docopt.cpp/0.6.3

[generators]
cmake_find_package_multi
CMakeDeps
2 changes: 1 addition & 1 deletion tests/myproj/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ endif()
run_vcpkg(VCPKG_URL "https://github.com/microsoft/vcpkg.git" VCPKG_REV
"10e052511428d6b0c7fcc63a139e8024bb146032" ENABLE_VCPKG_UPDATE
)
run_conan2()

project(myproj VERSION 0.2.0 LANGUAGES CXX C)

Expand Down Expand Up @@ -54,7 +55,6 @@ project_options(
PREFIX
"myproj"
ENABLE_CACHE
ENABLE_CONAN
# WARNINGS_AS_ERRORS
ENABLE_CPPCHECK
ENABLE_CLANG_TIDY
Expand Down
2 changes: 1 addition & 1 deletion tests/myproj/conanfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
docopt.cpp/0.6.3

[generators]
cmake_find_package_multi
CMakeDeps