Skip to content

Commit 00e144d

Browse files
committed
temp: test conan only
1 parent 3f7f2f8 commit 00e144d

16 files changed

+3
-72
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
cmake: true
6565
ninja: true
6666
vcpkg: true
67-
conan: 2.6.0
67+
conan: 2.7.1
6868
cppcheck: true
6969
clangtidy: true
7070
task: true

cspell.config.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,8 @@ words:
1313
- aarch
1414
- aminya
1515
- Amnet
16-
- androideabi
1716
- anotherproj
1817
- applellvm
19-
- armeabi
2018
- ARGN
2119
- armv
2220
- asan

tests/myproj/CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,6 @@ if(ENABLE_CROSS_COMPILING)
1717
enable_cross_compiler()
1818
endif()
1919

20-
# Override vcpkg triplets to install dynamic libraries instead of static libraries,
21-
# so we can test the installation of vcpkg-installed dependencies afterwards
22-
set(VCPKG_OVERLAY_TRIPLETS "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg_triplets")
23-
24-
run_vcpkg(VCPKG_URL "https://github.com/microsoft/vcpkg.git" VCPKG_REV
25-
"10e052511428d6b0c7fcc63a139e8024bb146032" ENABLE_VCPKG_UPDATE
26-
)
2720
run_conan()
2821

2922
project(myproj VERSION 0.2.0 LANGUAGES CXX C)

tests/myproj/conanfile.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
[requires]
44
docopt.cpp/0.6.3
5+
eigen/3.4.0
6+
fmt/11.0.2
57

68
[options]
79
docopt.cpp/*:shared=True

tests/myproj/vcpkg_triplets/arm-neon-android.cmake

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

tests/myproj/vcpkg_triplets/arm64-android.cmake

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

tests/myproj/vcpkg_triplets/arm64-osx.cmake

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

tests/myproj/vcpkg_triplets/arm64-uwp.cmake

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

tests/myproj/vcpkg_triplets/arm64-windows.cmake

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

tests/myproj/vcpkg_triplets/x64-android.cmake

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

0 commit comments

Comments
 (0)