Merge branch 'task/SDK-3549_common_tools_target' into 'develop'

SDK-3549 Fix old build systems Closes SDK-3549 See merge request sdk/sdk!5391
meganz · Mar 18, 2024 · 7e7946e · 7e7946e
2 parents 1809f07 + c2cb785
commit 7e7946e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/contrib/QtCreator/MEGAtests/MEGAtest_integration/MEGAtest_integration.pro b/contrib/QtCreator/MEGAtests/MEGAtest_integration/MEGAtest_integration.pro
@@ -52,15 +52,15 @@ QMAKE_CXXFLAGS+=-std=c++17
 
 SOURCES += \
 $$MEGASDK_BASE_PATH/tests/gtest_common.cpp \
+$$MEGASDK_BASE_PATH/tests/sdk_test_utils.cpp \
 $$MEGASDK_BASE_PATH/tests/integration/main.cpp \
 $$MEGASDK_BASE_PATH/tests/integration/SdkTest_test.cpp \
-$$MEGASDK_BASE_PATH/tests/integration/sdk_test_utils.cpp \
 $$MEGASDK_BASE_PATH/tests/integration/Sync_test.cpp
 
 HEADERS += \
 $$MEGASDK_BASE_PATH/tests/gtest_common.h \
+$$MEGASDK_BASE_PATH/tests/sdk_test_utils.h \
 $$MEGASDK_BASE_PATH/tests/integration/test.h \
-$$MEGASDK_BASE_PATH/tests/integration/sdk_test_utils.h \
 $$MEGASDK_BASE_PATH/tests/integration/SdkTest_test.h
 
 INCLUDEPATH += $$MEGASDK_BASE_PATH/tests

diff --git a/contrib/cmake/CMakeLists.txt b/contrib/cmake/CMakeLists.txt
@@ -1088,9 +1088,9 @@ add_executable(test_unit
 add_executable(test_integration
     ${MegaDir}/tests/gtest_common.cpp
     ${MegaDir}/tests/gtest_common.h
+    ${MegaDir}/tests/sdk_test_utils.cpp
+    ${MegaDir}/tests/sdk_test_utils.h
     ${MegaDir}/tests/integration/main.cpp
-    ${MegaDir}/tests/integration/sdk_test_utils.cpp
-    ${MegaDir}/tests/integration/sdk_test_utils.h
     ${MegaDir}/tests/integration/SdkTest_test.cpp
     ${MegaDir}/tests/integration/SdkTest_test.h
     ${MegaDir}/tests/integration/Sync_test.cpp

diff --git a/tests/include.am b/tests/include.am
@@ -35,8 +35,8 @@ tests_test_unit_SOURCES = \
 
 tests_test_integration_SOURCES = \
     tests/gtest_common.cpp \
+    tests/sdk_test_utils.cpp \
     tests/integration/main.cpp \
-    tests/integration/sdk_test_utils.cpp \
     tests/integration/SdkTest_test.cpp \
     tests/integration/Sync_test.cpp