From 02916883da24c4b9809d46df5367e559e30eed00 Mon Sep 17 00:00:00 2001 From: FeignClaims Date: Wed, 18 Sep 2024 17:40:40 +0800 Subject: [PATCH] temp: test conan only --- .github/workflows/ci.yml | 2 +- cspell.config.yaml | 2 -- src/PackageProject.cmake | 2 ++ tests/myproj/CMakeLists.txt | 7 ------- tests/myproj/conanfile.txt | 2 ++ tests/myproj/vcpkg_triplets/arm-neon-android.cmake | 6 ------ tests/myproj/vcpkg_triplets/arm64-android.cmake | 6 ------ tests/myproj/vcpkg_triplets/arm64-osx.cmake | 6 ------ tests/myproj/vcpkg_triplets/arm64-uwp.cmake | 6 ------ tests/myproj/vcpkg_triplets/arm64-windows.cmake | 3 --- tests/myproj/vcpkg_triplets/x64-android.cmake | 6 ------ tests/myproj/vcpkg_triplets/x64-linux.cmake | 5 ----- tests/myproj/vcpkg_triplets/x64-osx.cmake | 6 ------ tests/myproj/vcpkg_triplets/x64-uwp.cmake | 7 ------- tests/myproj/vcpkg_triplets/x64-windows-static.cmake | 3 --- tests/myproj/vcpkg_triplets/x64-windows.cmake | 4 ---- tests/myproj/vcpkg_triplets/x86-windows.cmake | 4 ---- 17 files changed, 5 insertions(+), 72 deletions(-) delete mode 100644 tests/myproj/vcpkg_triplets/arm-neon-android.cmake delete mode 100644 tests/myproj/vcpkg_triplets/arm64-android.cmake delete mode 100644 tests/myproj/vcpkg_triplets/arm64-osx.cmake delete mode 100644 tests/myproj/vcpkg_triplets/arm64-uwp.cmake delete mode 100644 tests/myproj/vcpkg_triplets/arm64-windows.cmake delete mode 100644 tests/myproj/vcpkg_triplets/x64-android.cmake delete mode 100644 tests/myproj/vcpkg_triplets/x64-linux.cmake delete mode 100644 tests/myproj/vcpkg_triplets/x64-osx.cmake delete mode 100644 tests/myproj/vcpkg_triplets/x64-uwp.cmake delete mode 100644 tests/myproj/vcpkg_triplets/x64-windows-static.cmake delete mode 100644 tests/myproj/vcpkg_triplets/x64-windows.cmake delete mode 100644 tests/myproj/vcpkg_triplets/x86-windows.cmake diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 40b74d2b..57fd77d4 100644 --- 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 index d68c63f5..f289b037 100644 --- 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/src/PackageProject.cmake b/src/PackageProject.cmake index 448a5347..e9311d65 100644 --- a/src/PackageProject.cmake +++ b/src/PackageProject.cmake @@ -258,6 +258,8 @@ function(package_project) ${FILE_SET_ARGS} ) set(runtime_dirs) + include(CMakePrintHelpers) + cmake_print_variables(CONAN_RUNTIME_LIB_DIRS) if(CONAN_RUNTIME_LIB_DIRS) list(APPEND runtime_dirs ${CONAN_RUNTIME_LIB_DIRS}) endif() diff --git a/tests/myproj/CMakeLists.txt b/tests/myproj/CMakeLists.txt index 78da6ddd..75b5ee58 100644 --- 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 index 4305f5bc..47560d8f 100644 --- 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 deleted file mode 100644 index a3c7e01b..00000000 --- a/tests/myproj/vcpkg_triplets/arm-neon-android.cmake +++ /dev/null @@ -1,6 +0,0 @@ -set(VCPKG_TARGET_ARCHITECTURE arm) -set(VCPKG_CRT_LINKAGE static) -set(VCPKG_LIBRARY_LINKAGE dynamic) -set(VCPKG_CMAKE_SYSTEM_NAME Android) -set(VCPKG_MAKE_BUILD_TRIPLET "--host=armv7a-linux-androideabi") -set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DANDROID_ABI=armeabi-v7a -DANDROID_ARM_NEON=ON) diff --git a/tests/myproj/vcpkg_triplets/arm64-android.cmake b/tests/myproj/vcpkg_triplets/arm64-android.cmake deleted file mode 100644 index 5f470691..00000000 --- a/tests/myproj/vcpkg_triplets/arm64-android.cmake +++ /dev/null @@ -1,6 +0,0 @@ -set(VCPKG_TARGET_ARCHITECTURE arm64) -set(VCPKG_CRT_LINKAGE static) -set(VCPKG_LIBRARY_LINKAGE dynamic) -set(VCPKG_CMAKE_SYSTEM_NAME Android) -set(VCPKG_MAKE_BUILD_TRIPLET "--host=aarch64-linux-android") -set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DANDROID_ABI=arm64-v8a) diff --git a/tests/myproj/vcpkg_triplets/arm64-osx.cmake b/tests/myproj/vcpkg_triplets/arm64-osx.cmake deleted file mode 100644 index c9b1243c..00000000 --- a/tests/myproj/vcpkg_triplets/arm64-osx.cmake +++ /dev/null @@ -1,6 +0,0 @@ -set(VCPKG_TARGET_ARCHITECTURE arm64) -set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE dynamic) - -set(VCPKG_CMAKE_SYSTEM_NAME Darwin) -set(VCPKG_OSX_ARCHITECTURES arm64) diff --git a/tests/myproj/vcpkg_triplets/arm64-uwp.cmake b/tests/myproj/vcpkg_triplets/arm64-uwp.cmake deleted file mode 100644 index b37c34e8..00000000 --- a/tests/myproj/vcpkg_triplets/arm64-uwp.cmake +++ /dev/null @@ -1,6 +0,0 @@ -set(VCPKG_TARGET_ARCHITECTURE arm64) -set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE dynamic) - -set(VCPKG_CMAKE_SYSTEM_NAME WindowsStore) -set(VCPKG_CMAKE_SYSTEM_VERSION 10.0) diff --git a/tests/myproj/vcpkg_triplets/arm64-windows.cmake b/tests/myproj/vcpkg_triplets/arm64-windows.cmake deleted file mode 100644 index 500d65fc..00000000 --- a/tests/myproj/vcpkg_triplets/arm64-windows.cmake +++ /dev/null @@ -1,3 +0,0 @@ -set(VCPKG_TARGET_ARCHITECTURE arm64) -set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE dynamic) diff --git a/tests/myproj/vcpkg_triplets/x64-android.cmake b/tests/myproj/vcpkg_triplets/x64-android.cmake deleted file mode 100644 index 953845ee..00000000 --- a/tests/myproj/vcpkg_triplets/x64-android.cmake +++ /dev/null @@ -1,6 +0,0 @@ -set(VCPKG_TARGET_ARCHITECTURE x64) -set(VCPKG_CRT_LINKAGE static) -set(VCPKG_LIBRARY_LINKAGE dynamic) -set(VCPKG_CMAKE_SYSTEM_NAME Android) -set(VCPKG_MAKE_BUILD_TRIPLET "--host=x86_64-linux-android") -set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DANDROID_ABI=x86_64) diff --git a/tests/myproj/vcpkg_triplets/x64-linux.cmake b/tests/myproj/vcpkg_triplets/x64-linux.cmake deleted file mode 100644 index 55bb50b3..00000000 --- a/tests/myproj/vcpkg_triplets/x64-linux.cmake +++ /dev/null @@ -1,5 +0,0 @@ -set(VCPKG_TARGET_ARCHITECTURE x64) -set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE dynamic) - -set(VCPKG_CMAKE_SYSTEM_NAME Linux) diff --git a/tests/myproj/vcpkg_triplets/x64-osx.cmake b/tests/myproj/vcpkg_triplets/x64-osx.cmake deleted file mode 100644 index 21fc2057..00000000 --- a/tests/myproj/vcpkg_triplets/x64-osx.cmake +++ /dev/null @@ -1,6 +0,0 @@ -set(VCPKG_TARGET_ARCHITECTURE x64) -set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE dynamic) - -set(VCPKG_CMAKE_SYSTEM_NAME Darwin) -set(VCPKG_OSX_ARCHITECTURES x86_64) diff --git a/tests/myproj/vcpkg_triplets/x64-uwp.cmake b/tests/myproj/vcpkg_triplets/x64-uwp.cmake deleted file mode 100644 index 902d8c23..00000000 --- a/tests/myproj/vcpkg_triplets/x64-uwp.cmake +++ /dev/null @@ -1,7 +0,0 @@ -set(VCPKG_TARGET_ARCHITECTURE x64) -set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE dynamic) - -set(VCPKG_CMAKE_SYSTEM_NAME WindowsStore) -set(VCPKG_CMAKE_SYSTEM_VERSION 10.0) - diff --git a/tests/myproj/vcpkg_triplets/x64-windows-static.cmake b/tests/myproj/vcpkg_triplets/x64-windows-static.cmake deleted file mode 100644 index ac78cbb5..00000000 --- a/tests/myproj/vcpkg_triplets/x64-windows-static.cmake +++ /dev/null @@ -1,3 +0,0 @@ -set(VCPKG_TARGET_ARCHITECTURE x64) -set(VCPKG_CRT_LINKAGE static) -set(VCPKG_LIBRARY_LINKAGE dynamic) diff --git a/tests/myproj/vcpkg_triplets/x64-windows.cmake b/tests/myproj/vcpkg_triplets/x64-windows.cmake deleted file mode 100644 index d0be7297..00000000 --- a/tests/myproj/vcpkg_triplets/x64-windows.cmake +++ /dev/null @@ -1,4 +0,0 @@ -set(VCPKG_TARGET_ARCHITECTURE x64) -set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE dynamic) - diff --git a/tests/myproj/vcpkg_triplets/x86-windows.cmake b/tests/myproj/vcpkg_triplets/x86-windows.cmake deleted file mode 100644 index 93c43c3b..00000000 --- a/tests/myproj/vcpkg_triplets/x86-windows.cmake +++ /dev/null @@ -1,4 +0,0 @@ -set(VCPKG_TARGET_ARCHITECTURE x86) -set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE dynamic) -