qmake variable renamed to TINY_BUILD_SUBFOLDER

[skip ci]
silverqx · Jun 2, 2022 · 9b67c98 · 9b67c98
1 parent 4eda70e
commit 9b67c98
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 10 deletions.
diff --git a/qmake/TinyOrm.pri b/qmake/TinyOrm.pri
@@ -1,6 +1,9 @@
 TINYORM_SOURCE_TREE = $$clean_path($$quote($$PWD/..))
 TINYTOM_SOURCE_TREE = $$quote($$TINYORM_SOURCE_TREE/tom)
 
+# Also Provides:
+# - TINY_BUILD_SUBFOLDER - folder by release type (/debug, /release, or empty)
+
 # Qt Common Configuration
 # ---
 
@@ -40,6 +43,6 @@ exists($$TINYORM_SOURCE_TREE): \
 
 !isEmpty(TINYORM_BUILD_TREE): \
 exists($$TINYORM_BUILD_TREE): {
-    LIBS += $$quote(-L$$clean_path($$TINYORM_BUILD_TREE)/src$${TINY_RELEASE_TYPE}/)
+    LIBS += $$quote(-L$$clean_path($$TINYORM_BUILD_TREE)/src$${TINY_BUILD_SUBFOLDER}/)
     LIBS += -lTinyOrm
 }
diff --git a/qmake/common.pri b/qmake/common.pri
@@ -89,8 +89,8 @@ mingw|if(unix:!macx): include(unixconf.pri)
 # Folder by release type
 debug_and_release: {
     CONFIG(release, debug|release): \
-        TINY_RELEASE_TYPE = $$quote(/release)
+        TINY_BUILD_SUBFOLDER = $$quote(/release)
     else:CONFIG(debug, debug|release): \
-        TINY_RELEASE_TYPE = $$quote(/debug)
+        TINY_BUILD_SUBFOLDER = $$quote(/debug)
 }
-else: TINY_RELEASE_TYPE =
+else: TINY_BUILD_SUBFOLDER =
diff --git a/qmake/tom.pri b/qmake/tom.pri
@@ -61,6 +61,6 @@ exists($$TINYORM_SOURCE_TREE): \
 
 !isEmpty(TINYORM_BUILD_TREE): \
 exists($$TINYORM_BUILD_TREE): {
-    LIBS += $$quote(-L$$clean_path($$TINYORM_BUILD_TREE)/src$${TINY_RELEASE_TYPE}/)
+    LIBS += $$quote(-L$$clean_path($$TINYORM_BUILD_TREE)/src$${TINY_BUILD_SUBFOLDER}/)
     LIBS += -lTinyOrm
 }
diff --git a/tests/auto/functional/others/version/version.pro b/tests/auto/functional/others/version/version.pro
@@ -15,11 +15,11 @@ win32 {
         DEFINES += TINYTEST_VERSION_IS_SHARED_BUILD
 
     TINYTEST_VERSION_TINYORM_PATH = \
-        $$quote($${TINYORM_BUILD_TREE}/src$${TINY_RELEASE_TYPE}/TinyOrm0.dll)
+        $$quote($${TINYORM_BUILD_TREE}/src$${TINY_BUILD_SUBFOLDER}/TinyOrm0.dll)
     TINYTEST_VERSION_TINYUTILS_PATH = \
-        $$quote($${TINYORM_BUILD_TREE}/tests/TinyUtils$${TINY_RELEASE_TYPE}/TinyUtils0.dll)
+        $$quote($${TINYORM_BUILD_TREE}/tests/TinyUtils$${TINY_BUILD_SUBFOLDER}/TinyUtils0.dll)
     TINYTEST_VERSION_TOMEXAMPLE_PATH = \
-        $$quote($${TINYORM_BUILD_TREE}/examples/tom$${TINY_RELEASE_TYPE}/tom.exe)
+        $$quote($${TINYORM_BUILD_TREE}/examples/tom$${TINY_BUILD_SUBFOLDER}/tom.exe)
 
     QMAKE_SUBSTITUTES += $$quote(include/versiondebug_qmake.hpp.in)
 

diff --git a/tests/qmake/TinyOrm.pri b/tests/qmake/TinyOrm.pri
@@ -19,5 +19,5 @@ INCLUDEPATH += $$quote($$TINYORM_SOURCE_TREE/include/)
 # Link against TinyORM library
 # ---
 
-LIBS += $$quote(-L$$TINYORM_BUILD_TREE/src$$TINY_RELEASE_TYPE/)
+LIBS += $$quote(-L$$TINYORM_BUILD_TREE/src$$TINY_BUILD_SUBFOLDER/)
 LIBS += -lTinyOrm
diff --git a/tests/qmake/TinyUtils.pri b/tests/qmake/TinyUtils.pri
@@ -13,4 +13,4 @@ INCLUDEPATH += $$quote($$TINYORM_SOURCE_TREE/tests/TinyUtils/src/)
 # Link against tests's TinyUtils library
 # ---
 
-LIBS += $$quote(-L$$TINYORM_BUILD_TREE/tests/TinyUtils$$TINY_RELEASE_TYPE/) -lTinyUtils
+LIBS += $$quote(-L$$TINYORM_BUILD_TREE/tests/TinyUtils$$TINY_BUILD_SUBFOLDER/) -lTinyUtils