temp: test conan only

aminya · Sep 18, 2024 · 00e144d · 00e144d
1 parent 3f7f2f8
commit 00e144d
Show file tree

Hide file tree

Showing 16 changed files with 3 additions and 72 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -64,7 +64,7 @@ jobs:
           cmake: true
           ninja: true
           vcpkg: true
-          conan: 2.6.0
+          conan: 2.7.1
           cppcheck: true
           clangtidy: true
           task: true

diff --git a/cspell.config.yaml b/cspell.config.yaml
@@ -13,10 +13,8 @@ words:
   - aarch
   - aminya
   - Amnet
-  - androideabi
   - anotherproj
   - applellvm
-  - armeabi
   - ARGN
   - armv
   - asan

diff --git a/tests/myproj/CMakeLists.txt b/tests/myproj/CMakeLists.txt
@@ -17,13 +17,6 @@ if(ENABLE_CROSS_COMPILING)
   enable_cross_compiler()
 endif()
 
-# Override vcpkg triplets to install dynamic libraries instead of static libraries,
-# so we can test the installation of vcpkg-installed dependencies afterwards
-set(VCPKG_OVERLAY_TRIPLETS "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg_triplets")
-
-run_vcpkg(VCPKG_URL "https://github.com/microsoft/vcpkg.git" VCPKG_REV
-          "10e052511428d6b0c7fcc63a139e8024bb146032" ENABLE_VCPKG_UPDATE
-)
 run_conan()
 
 project(myproj VERSION 0.2.0 LANGUAGES CXX C)

diff --git a/tests/myproj/conanfile.txt b/tests/myproj/conanfile.txt
@@ -2,6 +2,8 @@
 
 [requires]
 docopt.cpp/0.6.3
+eigen/3.4.0
+fmt/11.0.2
 
 [options]
 docopt.cpp/*:shared=True

diff --git a/tests/myproj/vcpkg_triplets/arm-neon-android.cmake b/tests/myproj/vcpkg_triplets/arm-neon-android.cmake
diff --git a/tests/myproj/vcpkg_triplets/arm64-android.cmake b/tests/myproj/vcpkg_triplets/arm64-android.cmake
diff --git a/tests/myproj/vcpkg_triplets/arm64-osx.cmake b/tests/myproj/vcpkg_triplets/arm64-osx.cmake
diff --git a/tests/myproj/vcpkg_triplets/arm64-uwp.cmake b/tests/myproj/vcpkg_triplets/arm64-uwp.cmake
diff --git a/tests/myproj/vcpkg_triplets/arm64-windows.cmake b/tests/myproj/vcpkg_triplets/arm64-windows.cmake
diff --git a/tests/myproj/vcpkg_triplets/x64-android.cmake b/tests/myproj/vcpkg_triplets/x64-android.cmake
diff --git a/tests/myproj/vcpkg_triplets/x64-linux.cmake b/tests/myproj/vcpkg_triplets/x64-linux.cmake
diff --git a/tests/myproj/vcpkg_triplets/x64-osx.cmake b/tests/myproj/vcpkg_triplets/x64-osx.cmake
diff --git a/tests/myproj/vcpkg_triplets/x64-uwp.cmake b/tests/myproj/vcpkg_triplets/x64-uwp.cmake
diff --git a/tests/myproj/vcpkg_triplets/x64-windows-static.cmake b/tests/myproj/vcpkg_triplets/x64-windows-static.cmake
diff --git a/tests/myproj/vcpkg_triplets/x64-windows.cmake b/tests/myproj/vcpkg_triplets/x64-windows.cmake
diff --git a/tests/myproj/vcpkg_triplets/x86-windows.cmake b/tests/myproj/vcpkg_triplets/x86-windows.cmake