From 941392c597d64ce3335aedb4d41a04db331e53f8 Mon Sep 17 00:00:00 2001 From: silverqx Date: Thu, 2 Nov 2023 08:32:07 +0100 Subject: [PATCH] vcpkg removed triplet from usage.in --- cmake/Modules/TinyInitDefaultVariables.cmake | 1 - cmake/vcpkg/ports/tinyorm-qt5/portfile.cmake | 2 -- cmake/vcpkg/ports/tinyorm/portfile.cmake | 2 -- cmake/vcpkg/usage.in | 2 +- 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/cmake/Modules/TinyInitDefaultVariables.cmake b/cmake/Modules/TinyInitDefaultVariables.cmake index 50cc80a3e..52a4c0a98 100644 --- a/cmake/Modules/TinyInitDefaultVariables.cmake +++ b/cmake/Modules/TinyInitDefaultVariables.cmake @@ -251,7 +251,6 @@ $${TINY_PATH_SEPAR if(NOT TINY_VCPKG) set(TINY_VCPKG FALSE) set(TINY_PORT TINY_PORT-NOTFOUND) - set(TINY_TARGET_TRIPLET TARGET_TRIPLET-NOTFOUND) endif() # Specifies which global constant types will be used diff --git a/cmake/vcpkg/ports/tinyorm-qt5/portfile.cmake b/cmake/vcpkg/ports/tinyorm-qt5/portfile.cmake index ec558baf0..220b2ecde 100644 --- a/cmake/vcpkg/ports/tinyorm-qt5/portfile.cmake +++ b/cmake/vcpkg/ports/tinyorm-qt5/portfile.cmake @@ -28,8 +28,6 @@ vcpkg_cmake_configure( -DTINY_VCPKG:BOOL=ON -DVERBOSE_CONFIGURE:BOOL=ON ${FEATURE_OPTIONS} - OPTIONS_RELEASE - -DTINY_TARGET_TRIPLET:STRING=${TARGET_TRIPLET} ) vcpkg_cmake_install() diff --git a/cmake/vcpkg/ports/tinyorm/portfile.cmake b/cmake/vcpkg/ports/tinyorm/portfile.cmake index ec558baf0..220b2ecde 100644 --- a/cmake/vcpkg/ports/tinyorm/portfile.cmake +++ b/cmake/vcpkg/ports/tinyorm/portfile.cmake @@ -28,8 +28,6 @@ vcpkg_cmake_configure( -DTINY_VCPKG:BOOL=ON -DVERBOSE_CONFIGURE:BOOL=ON ${FEATURE_OPTIONS} - OPTIONS_RELEASE - -DTINY_TARGET_TRIPLET:STRING=${TARGET_TRIPLET} ) vcpkg_cmake_install() diff --git a/cmake/vcpkg/usage.in b/cmake/vcpkg/usage.in index 7376c5c83..d3409b2b5 100644 --- a/cmake/vcpkg/usage.in +++ b/cmake/vcpkg/usage.in @@ -1,4 +1,4 @@ -The @TINY_PORT@:@TINY_TARGET_TRIPLET@ port provides the following CMake targets: +The @TINY_PORT@ port provides the following CMake targets: find_package(@TinyOrm_ns@ @tinyOrmPackageVersion@ CONFIG REQUIRED) target_link_libraries(main PRIVATE @TinyOrm_ns@::@TinyOrm_target@)