Test: build fixed

VioletGiraffe · Aug 20, 2024 · 7d48cf4 · 7d48cf4
1 parent 9856611
commit 7d48cf4
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 18 deletions.
diff --git a/file-commander-core/core-tests/filecomparator/filecomparator.pro b/file-commander-core/core-tests/filecomparator/filecomparator.pro
@@ -5,13 +5,14 @@ TARGET = filecomparator_test
 include(../../config.pri)
 
 DESTDIR  = ../../../bin/$${OUTPUT_DIR}
+DESTDIR_NOARCH  = ../../../bin/$${OUTPUT_DIR_NOARCH}
 OBJECTS_DIR = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 MOC_DIR     = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 UI_DIR      = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 RCC_DIR     = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 
 mac*|linux*|freebsd{
-	PRE_TARGETDEPS += $${DESTDIR}/libcpputils.a $${DESTDIR}/libtest_utils.a
+	PRE_TARGETDEPS += $${DESTDIR_NOARCH}/libcpputils.a $${DESTDIR}/libtest_utils.a
 }
 
 for (included_item, INCLUDEPATH): INCLUDEPATH += ../../$${included_item}
@@ -20,7 +21,7 @@ INCLUDEPATH += \
 	../../src/ \
 	../test-utils/src/
 
-LIBS += -L$${DESTDIR} -lcpputils -ltest_utils
+LIBS += -L$${DESTDIR} -L$${DESTDIR_NOARCH} -lcpputils -ltest_utils
 
 SOURCES += \
 	filecomparator_test.cpp \

diff --git a/file-commander-core/core-tests/filesystemobject-high-level/filesystemobject-high-level.pro b/file-commander-core/core-tests/filesystemobject-high-level/filesystemobject-high-level.pro
@@ -5,20 +5,21 @@ TARGET = fso_test_high_level
 include(../../config.pri)
 
 DESTDIR  = ../../../bin/$${OUTPUT_DIR}
+DESTDIR_NOARCH  = ../../../bin/$${OUTPUT_DIR_NOARCH}
 OBJECTS_DIR = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 MOC_DIR     = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 UI_DIR      = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 RCC_DIR     = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 
 mac*|linux*|freebsd{
-	PRE_TARGETDEPS += $${DESTDIR}/libqtutils.a $${DESTDIR}/libcpputils.a
+	PRE_TARGETDEPS += $${DESTDIR}/libqtutils.a $${DESTDIR_NOARCH}/libcpputils.a
 }
 
 for (included_item, INCLUDEPATH): INCLUDEPATH += ../../$${included_item}
 INCLUDEPATH += \
 	$${PWD}/
 
-LIBS += -L$${DESTDIR} -lqtutils -lcpputils
+LIBS += -L$${DESTDIR} -L$${DESTDIR_NOARCH} -lqtutils -lcpputils
 
 SOURCES += \
 	../../src/filesystemhelperfunctions.cpp \

diff --git a/file-commander-core/core-tests/filesystemobject/filesystemobject.pro b/file-commander-core/core-tests/filesystemobject/filesystemobject.pro
@@ -5,20 +5,21 @@ TARGET   = fso_test
 include(../../config.pri)
 
 DESTDIR  = ../../../bin/$${OUTPUT_DIR}
+DESTDIR_NOARCH  = ../../../bin/$${OUTPUT_DIR_NOARCH}
 OBJECTS_DIR = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 MOC_DIR     = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 UI_DIR      = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 RCC_DIR     = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 
 mac*|linux*|freebsd{
-	PRE_TARGETDEPS += $${DESTDIR}/libqtutils.a $${DESTDIR}/libcpputils.a
+	PRE_TARGETDEPS += $${DESTDIR}/libqtutils.a $${DESTDIR_NOARCH}/libcpputils.a
 }
 
 for (included_item, INCLUDEPATH): INCLUDEPATH += ../../$${included_item}
 INCLUDEPATH += \
 	$${PWD}/
 
-LIBS += -L$${DESTDIR} -lqtutils -lcpputils
+LIBS += -L$${DESTDIR} -L$${DESTDIR_NOARCH} -lqtutils -lcpputils
 
 SOURCES += \
 	../../src/filesystemhelperfunctions.cpp \

diff --git a/file-commander-core/core-tests/operationperformer/operationperformer.pro b/file-commander-core/core-tests/operationperformer/operationperformer.pro
@@ -5,17 +5,17 @@ CONFIG += console
 include(../../config.pri)
 
 DESTDIR  = ../../../bin/$${OUTPUT_DIR}
-DESTDIR_NO_ARCH = ../../../bin/$${OUTPUT_DIR_NO_ARCH}
+DESTDIR_NOARCH  = ../../../bin/$${OUTPUT_DIR_NOARCH}
 OBJECTS_DIR = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 MOC_DIR     = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 UI_DIR      = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 RCC_DIR     = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 
-LIBS += -L$${DESTDIR} -lcpputils -lqtutils -ltest_utils
-LIBS += -L$${DESTDIR_NO_ARCH} -lthin_io
+LIBS += -L$${DESTDIR} -lqtutils -ltest_utils
+LIBS += -L$${DESTDIR_NOARCH} -lcpputils -lthin_io
 
 mac*|linux*|freebsd{
-	PRE_TARGETDEPS += $${DESTDIR}/libqtutils.a $${DESTDIR}/libcpputils.a
+	PRE_TARGETDEPS += $${DESTDIR}/libqtutils.a $${DESTDIR_NOARCH}/libcpputils.a
 }
 
 INCLUDEPATH += \

diff --git a/file-commander-core/core-tests/test-utils/test-utils.pro b/file-commander-core/core-tests/test-utils/test-utils.pro
@@ -7,13 +7,14 @@ QT = core
 include(../../config.pri)
 
 DESTDIR  = ../../../bin/$${OUTPUT_DIR}
+DESTDIR_NOARCH  = ../../../bin/$${OUTPUT_DIR_NOARCH}
 OBJECTS_DIR = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 MOC_DIR     = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 UI_DIR      = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 RCC_DIR     = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 
 mac*|linux*|freebsd{
-	PRE_TARGETDEPS += $${DESTDIR}/libqtutils.a $${DESTDIR}/libcpputils.a
+	PRE_TARGETDEPS += $${DESTDIR}/libqtutils.a $${DESTDIR_NOARCH}/libcpputils.a
 }
 
 INCLUDEPATH += ../../src/
@@ -22,14 +23,14 @@ for (included_item, INCLUDEPATH): INCLUDEPATH += ../../$${included_item}
 HEADERS += \
 	src/cfolderenumeratorrecursive.h \
 	src/ctestfoldergenerator.h \
-    src/catch2_utils.hpp \
-    src/foldercomparator.h \
-    src/qt_helpers.hpp \
-    src/crandomdatagenerator.h
+	src/catch2_utils.hpp \
+	src/foldercomparator.h \
+	src/qt_helpers.hpp \
+	src/crandomdatagenerator.h
 
 SOURCES += \
 	src/cfolderenumeratorrecursive.cpp \
 	src/ctestfoldergenerator.cpp \
-    src/foldercomparator.cpp \
-    src/qt_helpers.cpp \
-    src/crandomdatagenerator.cpp
+	src/foldercomparator.cpp \
+	src/qt_helpers.cpp \
+	src/crandomdatagenerator.cpp