diff --git a/.github/workflows/rockylinux.yml b/.github/workflows/rockylinux.yml index e265c54dc9..dd578452bc 100644 --- a/.github/workflows/rockylinux.yml +++ b/.github/workflows/rockylinux.yml @@ -172,7 +172,7 @@ jobs: run: | echo "$PATH" echo ------ - cd ${{ env.BUILD_DIR }}/bin/release + cd ${{ env.BUILD_DIR }}/bin env QT_QPA_PLATFORM=minimal python3 "${GITHUB_WORKSPACE}/buildScripts/tests/fieldstest.py" ./2D-model "${GITHUB_WORKSPACE}/testing_small" - name: Build installer diff --git a/.github/workflows/windows_build_with_installer.yml b/.github/workflows/windows_build_with_installer.yml index 9fc2b72b0c..089c842d49 100644 --- a/.github/workflows/windows_build_with_installer.yml +++ b/.github/workflows/windows_build_with_installer.yml @@ -162,7 +162,7 @@ jobs: - name: Prepare all dlls if: false run: | - for file in $(ls ${{ env.BUILD_DIR }}/bin/release/*.exe || :) ; do windeployqt --release $file ; done + for file in $(ls ${{ env.BUILD_DIR }}/bin/*.exe || :) ; do windeployqt --release $file ; done - name: Download tests run: | @@ -177,7 +177,7 @@ jobs: run: | echo "$PATH" echo ------ - cd ${{ env.BUILD_DIR }}/bin/release + cd ${{ env.BUILD_DIR }}/bin python "${{ github.workspace }}\buildScripts\tests\fieldstest.py" 2D-model.exe "${{ github.workspace }}\testing_small" - name: Push binaries @@ -185,7 +185,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: binaries-${{ matrix.qt-version}} - path: ${{ env.BUILD_DIR }}/bin/release + path: ${{ env.BUILD_DIR }}/bin - name: Build installer run: | diff --git a/.gitignore b/.gitignore index 424e7000f0..7f0559f4b3 100644 --- a/.gitignore +++ b/.gitignore @@ -9,20 +9,14 @@ buildScripts/.pyenv-*/ .qmake.cache *~ *.autosave -*.a -*.moc -*.o -*.obj *.orig *.rej -*.so *.qm .#* *.*# Thumbs.db Makefile* *.pro.user* -bin/* *.sdf *.Debug *.Release diff --git a/.qmake.cache.in b/.qmake.cache.in index e5efa15ab2..d6bca28bba 100644 --- a/.qmake.cache.in +++ b/.qmake.cache.in @@ -1,11 +1 @@ -CONFIG ''= $$CONFIG -GLOBAL_DESTDIR = $$absolute_path($$GLOBAL_OUTPWD/bin/$$CONFIGURATION) include($$GLOBAL_PWD/global.pri) - -TRIK_STUDIO_VERSION = $$TRIK_STUDIO_VERSION -PROJECT_GIT_VERSION_BUILD=$$PROJECT_GIT_VERSION_BUILD -PROJECT_GIT_VERSION_PATCH=$$PROJECT_GIT_VERSION_PATCH -PROJECT_GIT_VERSION_MINOR=$$PROJECT_GIT_VERSION_MINOR -PROJECT_GIT_VERSION_MAJOR=$$PROJECT_GIT_VERSION_MAJOR - -TRIK_STUDIO_YEAR = $$TRIK_STUDIO_YEAR diff --git a/buildScripts/github/build_installer.sh b/buildScripts/github/build_installer.sh index 1947e7e161..d3f27f65f1 100755 --- a/buildScripts/github/build_installer.sh +++ b/buildScripts/github/build_installer.sh @@ -25,9 +25,9 @@ fi if [[ $RUNNER_OS == Linux ]] ; then echo Start build checker archive - $EXECUTOR bash -c "bin/$CONFIG/build-checker-installer.sh" + $EXECUTOR bash -c "bin/build-checker-installer.sh" if $NEED_DEPLOY ; then - $EXECUTOR bash -c "rsync -v --rsh='ssh -o StrictHostKeyChecking=no' bin/$CONFIG/trik_checker.tar.xz $username@$host:~/dl/ts/fresh/checker/checker-linux-$CONFIG-$BRANCH_NAME.tar.xz" + $EXECUTOR bash -c "rsync -v --rsh='ssh -o StrictHostKeyChecking=no' bin/trik_checker.tar.xz $username@$host:~/dl/ts/fresh/checker/checker-linux-$CONFIG-$BRANCH_NAME.tar.xz" fi fi diff --git a/buildScripts/github/build_internal.sh b/buildScripts/github/build_internal.sh index f7ce9d59ae..3814154f80 100755 --- a/buildScripts/github/build_internal.sh +++ b/buildScripts/github/build_internal.sh @@ -18,12 +18,12 @@ make -j $(nproc) qmake_all 2>&1 | tee -a build.log ccache -s make -j $(nproc) all 2>&1 | tee -a build.log ccache -s -ls bin/$CONFIG +ls bin export QT_QPA_PLATFORM=minimal export ASAN_OPTIONS=$(if [[ $RUNNER_OS == Linux ]]; then echo 'detect_leaks=1:'; else echo -n ''; fi)detect_stack_use_after_return=1:fast_unwind_on_malloc=0 -export LSAN_OPTIONS=suppressions=$PWD/bin/$CONFIG/lsan.supp:print_suppressions=0 +export LSAN_OPTIONS=suppressions=$PWD/bin/lsan.supp:print_suppressions=0 export DISPLAY=:0 export TRIK_PYTHONPATH=${TRIK_PYTHONPATH:-$(python3.${TRIK_PYTHON3_VERSION_MINOR} -c 'import sys; import os; print(os.pathsep.join(sys.path))')} export PYTHONMALLOC=malloc env -make check -k -s && ( set +eux ; cd "bin/$CONFIG" && eval "$TESTS" ) +make check -k -s && ( set +eux ; cd "bin" && eval "$TESTS" ) diff --git a/buildScripts/github/test.sh b/buildScripts/github/test.sh index 2d512eab9e..2f24452a3f 100755 --- a/buildScripts/github/test.sh +++ b/buildScripts/github/test.sh @@ -4,9 +4,9 @@ set -euo pipefail [ -r tests_qrs.7z ] || curl -Lo tests_qrs.7z https://dl.trikset.com/edu/.solutions20200701/testing_small.7z 7z -y x tests_qrs.7z env ASAN_OPTIONS=${ASAN_OPTIONS:-use_sigaltstack=0:fast_unwind_on_malloc=0:detect_leaks=1:detect_stack_use_after_return=1} \ - LSAN_OPTIONS=${LSAN_OPTIONS:-suppressions=$PWD/bin/$CONFIG/lsan.supp:print_suppressions=0} \ + LSAN_OPTIONS=${LSAN_OPTIONS:-suppressions=$PWD/bin/lsan.supp:print_suppressions=0} \ QT_QPA_PLATFORM=${QT_QPA_PLATFORM:-minimal} \ TRIK_PYTHONPATH=${TRIK_PYTHONPATH:-$(python3.${TRIK_PYTHON3_VERSION_MINOR} -c 'import sys; import os; print(os.pathsep.join(sys.path))')} \ PYTHONMALLOC=${PYTHONMALLOC:-malloc} \ PYTHONIOENCODING=utf-8 \ - python3.${TRIK_PYTHON3_VERSION_MINOR} "$(dirname $(realpath ${BASH_SOURCE[0]}))"/../tests/fieldstest.py bin/$CONFIG/2D-model testing_small + python3.${TRIK_PYTHON3_VERSION_MINOR} "$(dirname $(realpath ${BASH_SOURCE[0]}))"/../tests/fieldstest.py bin/2D-model testing_small diff --git a/global.pri b/global.pri index 5f5575be56..9fc0bad1c1 100644 --- a/global.pri +++ b/global.pri @@ -15,18 +15,6 @@ !isEmpty(_PRO_FILE_):!isEmpty(CONFIG):isEmpty(GLOBAL_PRI_INCLUDED){ #GLOBAL_PRI_INCLUDED = $$PWD -win32 { - PLATFORM = windows -} - -unix:!macx { - PLATFORM = linux -} - -macx { - PLATFORM = mac -} - CONFIG *= qt thread exceptions !win32:CONFIG *= use_gold_linker @@ -43,16 +31,9 @@ CONFIG = $$unique(CONFIG) macx:QT_CONFIG -= no-pkg-config QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -Og -CONFIG(debug) { - CONFIGURATION = debug - CONFIGURATION_SUFFIX = - unix { +unix:debug { QMAKE_CXXFLAGS += -coverage QMAKE_LFLAGS += -coverage - } -} else { - CONFIGURATION = release - CONFIGURATION_SUFFIX = } !gcc4:!gcc5:!clang:!win32:gcc:*-g++*:system($$QMAKE_CXX --version | grep -qEe '"\\<5\\.[0-9]+\\."' ){ CONFIG += gcc5 } @@ -63,7 +44,7 @@ GLOBAL_OUTPWD = $$absolute_path($$OUT_PWD) isEmpty(GLOBAL_DESTDIR) { - GLOBAL_DESTDIR = $$GLOBAL_OUTPWD/bin/$$CONFIGURATION + GLOBAL_DESTDIR = $$GLOBAL_OUTPWD/bin } isEmpty(DESTDIR) { @@ -81,7 +62,7 @@ isEmpty(TARGET) { } equals(TEMPLATE, app) { - VERSION = $${PROJECT_GIT_VERSION_MAJOR}$${PROJECT_GIT_VERSION_MINOR}.$${PROJECT_GIT_VERSION_PATCH}.$${PROJECT_GIT_VERSION_BUILD} + VERSION = $${PROJECT_GIT_VERSION_MAJOR}$${PROJECT_GIT_VERSION_MINOR}.$${PROJECT_GIT_VERSION_PATCH}.$${PROJECT_GIT_VERSION_BUILD} !no_rpath { #reset default rpath before setting new one #but this clears path to Qt libraries @@ -109,7 +90,7 @@ use_gold_linker:!clang: QMAKE_LFLAGS += -Wl,--disable-new-dtags macx:QMAKE_TARGET_BUNDLE_PREFIX = com.cybertech macx-clang { - QMAKE_MACOSX_DEPLOYMENT_TARGET=10.12 + QMAKE_MACOSX_DEPLOYMENT_TARGET=10.12 QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/ } @@ -164,11 +145,11 @@ equals(TEMPLATE, lib) { QMAKE_SANITIZE_UNDEFINED_LFLAGS *= $$TRIK_SANITIZE_UNDEFINED_FLAGS } - sanitize_memory { - QMAKE_CFLAGS *= -fsanitize-memory-use-after-dtor -fsanitize-memory-track-origins - QMAKE_CXXFLAGS *= -fsanitize-memory-use-after-dtor -fsanitize-memory-track-origins + sanitize_memory { + QMAKE_CFLAGS *= -fsanitize-memory-use-after-dtor -fsanitize-memory-track-origins + QMAKE_CXXFLAGS *= -fsanitize-memory-use-after-dtor -fsanitize-memory-track-origins - } + } unix { QMAKE_CFLAGS_RELEASE += -fsanitize-recover=all @@ -182,16 +163,11 @@ equals(TEMPLATE, lib) { } } -OBJECTS_DIR = .build/$$CONFIGURATION/obj -MOC_DIR = .build/$$CONFIGURATION/moc -RCC_DIR = .build/$$CONFIGURATION/rcc -UI_DIR = .build/$$CONFIGURATION/ui - !noPch:CONFIG *= precompile_header precompile_header:isEmpty(PRECOMPILED_HEADER):PRECOMPILED_HEADER = $$PWD/pch.h precompile_header:!isEmpty(PRECOMPILED_HEADER) { - QMAKE_CXXFLAGS += -include $$PRECOMPILED_HEADER -fpch-preprocess + QMAKE_CXXFLAGS *= -include $$PRECOMPILED_HEADER -fpch-preprocess } !warn_off:QMAKE_CXXFLAGS *= -Wno-error=invalid-pch @@ -351,7 +327,7 @@ defineTest(enableFlagIfCan) { } defineReplace(fullSystemPath) { - return($$system_path($$clean_path($$absolute_path($$1)))) + return($$system_path($$clean_path($$absolute_path($$1)))) } CONFIG(noPch) { diff --git a/initvars.qmake b/initvars.qmake index 24d36e4346..4f77b22a7f 100644 --- a/initvars.qmake +++ b/initvars.qmake @@ -1,7 +1,11 @@ include($$PWD/global.pri) TEMPLATE=subdirs SUBDIRS= -#DESTDIR = $$absolute_path($$DESTDIR) +QMAKE_SUBSTITUTES += .qmake.cache.in +DISTFILES += .qmake.cache.in + +GLOBAL_DESTDIR = $$absolute_path($$GLOBAL_OUTPWD/bin) +cache(GLOBAL_DESTDIR, set super) # ATM we use xenial 16.04 as main linux builder, and it lacks new git with --broken option. REPO_GIT_VERSION_STRING=$$system(git -C $$PWD -c $$system_quote(safe.directory=*) describe --tags --always --dirty --abbrev=6 || true) @@ -20,16 +24,21 @@ isEmpty(PROJECT_GIT_VERSION_PATCH):PROJECT_GIT_VERSION_PATCH=0 isEmpty(PROJECT_GIT_VERSION_MINOR):PROJECT_GIT_VERSION_MINOR=0 isEmpty(PROJECT_GIT_VERSION_MAJOR):PROJECT_GIT_VERSION_MAJOR=0 +cache(PROJECT_GIT_VERSION_BUILD, set super) +cache(PROJECT_GIT_VERSION_PATCH, set super) +cache(PROJECT_GIT_VERSION_MINOR, set super) +cache(PROJECT_GIT_VERSION_MAJOR, set super) + TRIK_STUDIO_VERSION=$$REPO_GIT_VERSION_STRING isEmpty(TRIK_STUDIO_VERSION):TRIK_STUDIO_VERSION=UNDEFINED.999 message(Version is "$$TRIK_STUDIO_VERSION with codes" \ $$PROJECT_GIT_VERSION_MAJOR/$$PROJECT_GIT_VERSION_MINOR/$$PROJECT_GIT_VERSION_PATCH/$$PROJECT_GIT_VERSION_BUILD) +cache(TRIK_STUDIO_VERSION, set super) #obsolete??? TRIK_STUDIO_YEAR = 2021 +cache(TRIK_STUDIO_YEAR, set super) -#message($$DESTDIR) -QMAKE_SUBSTITUTES += .qmake.cache.in - -DISTFILES += .qmake.cache.in +######## +cache(CONFIG, set super) diff --git a/installer/build-installer.sh b/installer/build-installer.sh index dcc4274729..8717f6519b 100755 --- a/installer/build-installer.sh +++ b/installer/build-installer.sh @@ -31,7 +31,7 @@ BUILD_DIR=$(dirname $(cygpath -u "$0")) [ -z "${4+x}" ] || BUILD_DIR="$4" BUILD_DIR=$(realpath $(cygpath -u "$BUILD_DIR")) -[ -z $BUILD_DIR ] && exit 1 || { [ -d "$BUILD_DIR/bin/release" ] && export BIN_DIR="$BUILD_DIR/bin/release" ; } || { [ -d "$BUILD_DIR/bin/debug" ] && export BIN_DIR="$BUILD_DIR/bin/debug" ; } +[ -z $BUILD_DIR ] && exit 1 || [ -d "$BUILD_DIR/bin" ] && export BIN_DIR="$BUILD_DIR/bin" echo "$BIN_DIR" if [ -x $BIN_DIR/trik-studio ] ; then binary_path=$BIN_DIR/trik-studio diff --git a/installer/platform/install-trik-studio.pri b/installer/platform/install-trik-studio.pri index c4d56a6733..f17dfbbef1 100644 --- a/installer/platform/install-trik-studio.pri +++ b/installer/platform/install-trik-studio.pri @@ -27,17 +27,17 @@ unix:!macx { #MAKE INSTALL res.path = $$PROGRAMDIR - res.extra = install -Dp -m0755 bin/release/trik-studio $(INSTALL_ROOT)$$BINDIR/trik-studio;\ + res.extra = install -Dp -m0755 bin/trik-studio $(INSTALL_ROOT)$$BINDIR/trik-studio;\ install -Dp -m0755 installer/platform/trikStudio.sh $(INSTALL_ROOT)$$BINDIR/trikStudio;\ test -d $(INSTALL_ROOT)$$LIBDIR/ || mkdir -p $(INSTALL_ROOT)$$LIBDIR/;\ - cp -a bin/release/*.so* $(INSTALL_ROOT)$$LIBDIR;\ + cp -a bin/*.so* $(INSTALL_ROOT)$$LIBDIR;\ test -d $(INSTALL_ROOT)$$PLUGINDIR || mkdir -p $(INSTALL_ROOT)$$PLUGINDIR;\ - cp -a bin/release/plugins/* $(INSTALL_ROOT)$$PLUGINDIR/;\ - cp -a bin/release/translations $(INSTALL_ROOT)$$PROGRAMDIR/;\ - cp -a bin/release/help $(INSTALL_ROOT)$$PROGRAMDIR/;\ - cp -a bin/release/images $(INSTALL_ROOT)$$PROGRAMDIR/;\ - cp -a bin/release/examples $(INSTALL_ROOT)$$PROGRAMDIR/;\ - cp -a bin/release/splashscreen.png $(INSTALL_ROOT)$$PROGRAMDIR/images;\ + cp -a bin/plugins/* $(INSTALL_ROOT)$$PLUGINDIR/;\ + cp -a bin/translations $(INSTALL_ROOT)$$PROGRAMDIR/;\ + cp -a bin/help $(INSTALL_ROOT)$$PROGRAMDIR/;\ + cp -a bin/images $(INSTALL_ROOT)$$PROGRAMDIR/;\ + cp -a bin/examples $(INSTALL_ROOT)$$PROGRAMDIR/;\ + cp -a bin/splashscreen.png $(INSTALL_ROOT)$$PROGRAMDIR/images;\ test -d $(INSTALL_ROOT)/etc || mkdir -p $(INSTALL_ROOT)/etc;\ echo 'pathToLogs=.config/trikStudio/logs/' > $(INSTALL_ROOT)$$CONFFILE;\ echo "pathToImages=$$PROGRAMDIR/images/iconset1/" >> $(INSTALL_ROOT)$$CONFFILE;\ diff --git a/plugins/editorsSdk/editorsCommon.pri b/plugins/editorsSdk/editorsCommon.pri index bf9bd50e97..3edbc0bf3c 100644 --- a/plugins/editorsSdk/editorsCommon.pri +++ b/plugins/editorsSdk/editorsCommon.pri @@ -37,9 +37,6 @@ macx { QRXC_DIR = $$DESTDIR DESTDIR = $$DESTDIR/plugins/editors/ -# Needed because somehow QMake fails to create .rcc directory if RESOURCES is in extra compiler output. -RCC_DIR = .build/$$CONFIGURATION/obj - links(qrkernel qrgraph qrutils qrgui-meta-meta-model) includes(qrgraph qrgui/plugins/metaMetaModel) diff --git a/plugins/editorsSdk/extraCompilers.pri b/plugins/editorsSdk/extraCompilers.pri index c64a91e47c..4005a4b2d1 100644 --- a/plugins/editorsSdk/extraCompilers.pri +++ b/plugins/editorsSdk/extraCompilers.pri @@ -63,7 +63,7 @@ qrxc_resource.variable_out = NEW_RESOURCES QMAKE_EXTRA_COMPILERS += qrxc_resource # Here we need to call moc explicitly because by default it will be called before any files were generated -new_moc.output = $$MOC_DIR/moc_${QMAKE_FILE_BASE}.cpp +new_moc.output = moc_${QMAKE_FILE_BASE}.cpp new_moc.commands = $$[QT_HOST_BINS/get]/moc -I $$GLOBAL_PWD/qrgui/plugins/metaMetaModel/include/ ${QMAKE_FILE_NAME} -o ${QMAKE_FILE_OUT} new_moc.input = MOC_HEADERS new_moc.variable_out = SOURCES @@ -71,7 +71,7 @@ new_moc.variable_out = SOURCES QMAKE_EXTRA_COMPILERS += new_moc # Here we need to call rcc explicitly because by tefault it will be called before any files were generated -new_rcc.output = $$RCC_DIR/rcc_${QMAKE_FILE_BASE}.cpp +new_rcc.output = rcc_${QMAKE_FILE_BASE}.cpp new_rcc.commands = $$[QT_HOST_BINS/get]/rcc ${QMAKE_FILE_NAME} -o ${QMAKE_FILE_OUT} new_rcc.input = NEW_RESOURCES new_rcc.variable_out = SOURCES diff --git a/plugins/robots/checker/scripts/build-checker-installer.sh b/plugins/robots/checker/scripts/build-checker-installer.sh index 83aac2eb54..794352ab32 100755 --- a/plugins/robots/checker/scripts/build-checker-installer.sh +++ b/plugins/robots/checker/scripts/build-checker-installer.sh @@ -51,7 +51,7 @@ fi pushd $qRealDir -QMAKE=$(check_qmake_version $qRealDir/../..) +QMAKE=$(check_qmake_version $qRealDir/..) echo "Using qmake: $QMAKE" QT_HOST_DATA=$($QMAKE -query QT_HOST_DATA) QT_INSTALL_PLUGINS=$($QMAKE -query QT_INSTALL_PLUGINS) diff --git a/plugins/robots/interpreters/interpreterCore/interpreterCore.pri b/plugins/robots/interpreters/interpreterCore/interpreterCore.pri index 78d3ac6aa7..b8ae13fa88 100644 --- a/plugins/robots/interpreters/interpreterCore/interpreterCore.pri +++ b/plugins/robots/interpreters/interpreterCore/interpreterCore.pri @@ -24,10 +24,10 @@ includes(plugins/robots/interpreters/interpreterCore \ qrtext \ ) -LIBS += -L$$GLOBAL_PWD/plugins/robots/thirdparty/trikRuntime/trikRuntime/bin/x86-$$CONFIGURATION +LIBS += -L$$GLOBAL_PWD/plugins/robots/thirdparty/trikRuntime/trikRuntime/bin links(qrkernel qrrepo qrutils qrtext qrgui-models qrgui-controller qrgui-preferences-dialog qrgui-plugin-manager \ - qrgui-tool-plugin-interface qrgui-text-editor robots-kit-base robots-utils robots-2d-model) + qrgui-tool-plugin-interface qrgui-text-editor robots-kit-base robots-utils robots-2d-model) DEFINES += TRIK_STUDIO_VERSION=$$shell_quote('"'$$TRIK_STUDIO_VERSION'"') diff --git a/plugins/robots/interpreters/trikKitInterpreterCommon/include/trikKitInterpreterCommon/trikbrick.h b/plugins/robots/interpreters/trikKitInterpreterCommon/include/trikKitInterpreterCommon/trikbrick.h index bf33473fd6..204a6306b8 100644 --- a/plugins/robots/interpreters/trikKitInterpreterCommon/include/trikKitInterpreterCommon/trikbrick.h +++ b/plugins/robots/interpreters/trikKitInterpreterCommon/include/trikKitInterpreterCommon/trikbrick.h @@ -97,6 +97,7 @@ public slots: trikControl::GamepadInterface *gamepad() override {return nullptr;} trikControl::FifoInterface *fifo(const QString &) override {return nullptr;} trikControl::I2cDeviceInterface *i2c(int, int) override {return nullptr;} + trikControl::IrCameraInterface *irCamera() override {return nullptr;} QVector getStillImage() override; trikControl::EventDeviceInterface *eventDevice(const QString &) override {return nullptr;} diff --git a/plugins/robots/interpreters/trikKitInterpreterCommon/trikKitInterpreterCommon.pri b/plugins/robots/interpreters/trikKitInterpreterCommon/trikKitInterpreterCommon.pri index 8d22db35ea..6655b36e24 100644 --- a/plugins/robots/interpreters/trikKitInterpreterCommon/trikKitInterpreterCommon.pri +++ b/plugins/robots/interpreters/trikKitInterpreterCommon/trikKitInterpreterCommon.pri @@ -33,14 +33,11 @@ includes( \ ) links(qrkernel qrutils qrtext qrgui-preferences-dialog qrgui-tool-plugin-interface \ - robots-utils robots-kit-base robots-2d-model robots-trik-kit \ - trikControl trikNetwork trikScriptRunner trikKernel qrgui-text-editor \ + robots-utils robots-kit-base robots-2d-model robots-trik-kit \ + trikControl trikNetwork trikScriptRunner trikKernel qrgui-text-editor \ ) copyToDestdir(./icons/trik-robot.svg, now, images/) -#LIBS += -L$$GLOBAL_PWD/plugins/robots/thirdparty/trikRuntime/trikRuntime/bin/x86-$$CONFIGURATION -# it's here because it looks like it can't be placed in a subdirs project (where is nothing to link) -#copyToDestdir($$GLOBAL_PWD/plugins/robots/thirdparty/trikRuntime/trikRuntime/bin/x86-$$CONFIGURATION/*) HEADERS += \ $$PWD/include/trikKitInterpreterCommon/declSpec.h \ diff --git a/plugins/robots/thirdparty/trikRuntime/trikRuntime b/plugins/robots/thirdparty/trikRuntime/trikRuntime index 7e6b41b8a9..165068cd98 160000 --- a/plugins/robots/thirdparty/trikRuntime/trikRuntime +++ b/plugins/robots/thirdparty/trikRuntime/trikRuntime @@ -1 +1 @@ -Subproject commit 7e6b41b8a98d8edb5bfafaa0c00bb139eb9dc122 +Subproject commit 165068cd981895cab27f1c72a091d5b911baa28c diff --git a/plugins/robots/thirdparty/trikRuntime/trikRuntime.pro b/plugins/robots/thirdparty/trikRuntime/trikRuntime.pro index 0046f60924..90ec2b8058 100644 --- a/plugins/robots/thirdparty/trikRuntime/trikRuntime.pro +++ b/plugins/robots/thirdparty/trikRuntime/trikRuntime.pro @@ -15,6 +15,9 @@ TEMPLATE = subdirs include(../../../../global.pri) +CONFIG += trik_not_brick +cache(CONFIG, set) + SUBDIRS += \ trikRuntimeQsLog \ trikKernel \ @@ -23,6 +26,7 @@ SUBDIRS += \ trikHal \ trikCommunicator \ trikScriptRunner \ + mlx90640-library \ # translations \ tests { @@ -36,7 +40,7 @@ tests { trikScriptRunner.depends += PythonQt PythonQt.subdir = $$PWD/trikRuntime/PythonQt } - +trikRuntimeQsLog.file = $$PWD/trikRuntime/qslog/QsLogSharedLibrary.pro trikScriptRunner.subdir = $$PWD/trikRuntime/trikScriptRunner trikCommunicator.subdir = $$PWD/trikRuntime/trikCommunicator trikKernel.subdir = $$PWD/trikRuntime/trikKernel @@ -45,7 +49,8 @@ trikControl.subdir = $$PWD/trikRuntime/trikControl translations.subdir = $$PWD/trikRuntime/translations trikHal.subdir = $$PWD/trikRuntime/trikHal trikRuntimeQsLog.file = $$PWD/trikRuntime/qslog/QsLogSharedLibrary.pro -trikControl.depends = trikKernel trikHal +mlx90640-library.subdir = $$PWD/trikRuntime/mlx90640-library +trikControl.depends = trikKernel trikHal mlx90640-library trikKernel.depends = trikRuntimeQsLog trikNetwork.depends = trikKernel trikScriptRunner.depends += trikControl trikKernel trikNetwork diff --git a/thirdparty/checkapp/checkapp.pro b/thirdparty/checkapp/checkapp.pro index 95c17ef24c..a40ace552d 100644 --- a/thirdparty/checkapp/checkapp.pro +++ b/thirdparty/checkapp/checkapp.pro @@ -15,8 +15,8 @@ TEMPLATE = app CONFIG -= app_bundle -include (../../global.pri) +include ($$PWD/../../global.pri) TARGET = checkapp -include (checkapp/checkapp.pri) +include ($$PWD/checkapp/checkapp.pri)