mirror/TinyORM
1
0
Fork 0
mirror of https://github.com/silverqx/TinyORM.git synced 2026-05-03 15:09:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

qmake used tiny_find_packages in TinyOrm.pri and tom.pri

Browse Source 
This will ensure all the new auto-detect features.

 - also updated comments
This commit is contained in:
silverqx
2023-08-09 18:45:11 +02:00
parent ad18c57ecf
commit d98e10f4ec
2 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qmake/TinyOrm.pri
+15 -13
View File
@@ -13,12 +13,16 @@
# You must define the following variables before the TinyOrm.pri will be included:
#
# - TINYORM_BUILD_TREE - path to the TinyORM build folder
# - TINY_VCPKG_ROOT - path to the vcpkg/installed/ folder (if is empty then it tries
# to use the VCPKG_ROOT environment variable)
# - TINY_VCPKG_TRIPLET - vcpkg triplet to use (vcpkg/installed/$${TINY_VCPKG_TRIPLET})
# - TINY_VCPKG_ROOT - path to the vcpkg installation folder (if not defined then
# it tries to use the VCPKG_ROOT environment variable)
# - TINY_VCPKG_TRIPLET - vcpkg triplet to use (vcpkg/installed/$$TINY_VCPKG_TRIPLET/);
# if not defined then it tries to guess the vcpkg triplet based
# on the current compiler and OS (based on the QMAKESPEC)
#
# These variables are set after the configuration is done:
#
# Also Provides:
# - TINY_BUILD_SUBFOLDER - folder by release type (/debug, /release, or empty)
# - TINY_VCPKG_INCLUDE - path to the vcpkg include folder (vcpkg/installed/<triplet>/include/)
# Path to the TinyORM source tree
TINYORM_SOURCE_TREE = $$clean_path($$quote($$PWD/..))
@@ -69,15 +73,13 @@ exists($$TINYORM_BUILD_TREE): \
# on the TINYORM_BUILD_TREE
LIBS += -lTinyOrm
# vcpkg - range-v3
# vcpkg - range-v3 and tabulate
# ---
# Affected by (in the following order):
# TINY_VCPKG_ROOT and TINY_VCPKG_TRIPLET qmake variables
# TINY_VCPKG_ROOT and TINY_VCPKG_TRIPLET environment variables
# VCPKG_ROOT and VCPKG_DEFAULT_TRIPLET environment variables
load(tiny_vcpkg)
load(tiny_find_packages)
TINY_VCPKG_ROOT = $$tiny_vcpkg_root()
TINY_VCPKG_TRIPLET = $$tiny_vcpkg_triplet()
!isEmpty(TINY_VCPKG_ROOT): \
!isEmpty(TINY_VCPKG_TRIPLET): \
tiny_add_system_includepath(\
$$quote($${TINY_VCPKG_ROOT}/installed/$${TINY_VCPKG_TRIPLET}/include/))
tiny_find_vcpkg()
qmake/tom.pri
+15 -14
View File
@@ -1,5 +1,5 @@
# The tom.pri file is available to simplify the integration of the TinyORM library
# into the tom migrations application.
# into the Tom migrations application.
#
# It sets up and configures the CONFIG and DEFINES qmake variables, adds the TinyORM, Tom,
# and vcpkg header files to the system INCLUDEPATH (cross-platform using the -isystem,
@@ -13,12 +13,16 @@
# You must define the following variables before the tom.pri will be included:
#
# - TINYORM_BUILD_TREE - path to the TinyORM build folder
# - TINY_VCPKG_ROOT - path to the vcpkg/installed/ folder (if is empty then it tries
# to use the VCPKG_ROOT environment variable)
# - TINY_VCPKG_TRIPLET - vcpkg triplet to use (vcpkg/installed/$${TINY_VCPKG_TRIPLET})
# - TINY_VCPKG_ROOT - path to the vcpkg installation folder (if not defined then
# it tries to use the VCPKG_ROOT environment variable)
# - TINY_VCPKG_TRIPLET - vcpkg triplet to use (vcpkg/installed/$$TINY_VCPKG_TRIPLET/);
# if not defined then it tries to guess the vcpkg triplet based
# on the current compiler and OS (based on the QMAKESPEC)
#
# These variables are set after the configuration is done:
#
# Also Provides:
# - TINY_BUILD_SUBFOLDER - folder by release type (/debug, /release, or empty)
# - TINY_VCPKG_INCLUDE - path to the vcpkg include folder (vcpkg/installed/<triplet>/include/)
# Path to the TinyORM source tree
TINYORM_SOURCE_TREE = $$clean_path($$quote($$PWD/..))
@@ -94,14 +98,11 @@ LIBS += -lTinyOrm
# vcpkg - range-v3 and tabulate
# ---
# VCPKG_ROOT and VCPKG_DEFAULT_TRIPLET environment variables are also taken into account
# Affected by (in the following order):
# TINY_VCPKG_ROOT and TINY_VCPKG_TRIPLET qmake variables
# TINY_VCPKG_ROOT and TINY_VCPKG_TRIPLET environment variables
# VCPKG_ROOT and VCPKG_DEFAULT_TRIPLET environment variables
load(tiny_vcpkg)
load(tiny_find_packages)
TINY_VCPKG_ROOT = $$tiny_vcpkg_root()
TINY_VCPKG_TRIPLET = $$tiny_vcpkg_triplet()
!isEmpty(TINY_VCPKG_ROOT): \
!isEmpty(TINY_VCPKG_TRIPLET): \
tiny_add_system_includepath(\
$$quote($${TINY_VCPKG_ROOT}/installed/$${TINY_VCPKG_TRIPLET}/include/))
tiny_find_vcpkg()