From a98bd715fcf6720bec96849744c10555fb1b0e97 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 24 Sep 2022 04:28:48 +0300 Subject: [PATCH] remove workflow and CI related files Signed-off-by: Ivailo Monev --- .github/workflows/codeql-analysis.yml | 57 ------------------- CMakeLists.txt | 4 +- appveyor.yml | 36 ------------ cmake/dbus.sh.cmake | 20 ------- cmake/modules/KatieBuildMacros.cmake | 25 +------- cmake/xvfb.sh.cmake | 28 --------- scripts/cicount.py | 24 -------- .../auto/qdbusabstractadaptor/CMakeLists.txt | 4 +- .../qdbusabstractinterface/CMakeLists.txt | 4 +- tests/auto/qdbusconnection/CMakeLists.txt | 4 +- tests/auto/qdbuscontext/CMakeLists.txt | 4 +- tests/auto/qdbusinterface/CMakeLists.txt | 4 +- tests/auto/qdbuslocalcalls/CMakeLists.txt | 4 +- tests/auto/qdbusmarshall/CMakeLists.txt | 4 +- tests/auto/qdbusmetaobject/CMakeLists.txt | 4 +- tests/auto/qdbusmetatype/CMakeLists.txt | 4 +- tests/auto/qdbuspendingcall/CMakeLists.txt | 4 +- tests/auto/qdbusreply/CMakeLists.txt | 4 +- tests/auto/qdbusservicewatcher/CMakeLists.txt | 4 +- tests/auto/qdbusthreading/CMakeLists.txt | 4 +- tests/auto/qdbustype/CMakeLists.txt | 4 +- tests/auto/qdbusxmlparser/CMakeLists.txt | 4 +- .../dbus/qdbusperformance/CMakeLists.txt | 4 +- .../benchmarks/dbus/qdbustype/CMakeLists.txt | 7 ++- 24 files changed, 53 insertions(+), 212 deletions(-) delete mode 100644 .github/workflows/codeql-analysis.yml delete mode 100644 appveyor.yml delete mode 100644 cmake/dbus.sh.cmake delete mode 100644 cmake/xvfb.sh.cmake delete mode 100755 scripts/cicount.py diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml deleted file mode 100644 index f9f29de3a..000000000 --- a/.github/workflows/codeql-analysis.yml +++ /dev/null @@ -1,57 +0,0 @@ -name: "CodeQL" - -on: - push: - branches: [master] - pull_request: - # The branches below must be a subset of the branches above - branches: [master] - schedule: - - cron: '0 7 * * 3' - -jobs: - analyze: - name: Analyze - runs-on: ubuntu-latest - - strategy: - fail-fast: false - matrix: - # Override automatic language detection by changing the below list - # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python'] - language: ['cpp', 'javascript', 'python'] - # Learn more... - # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection - - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - name: Install dependencies - run: | - sudo apt-get update -qq - sudo apt-get install -qq libdeflate-dev libjansson-dev libc6-dev libpng-dev libcups2-dev libfreetype6-dev libfontconfig1-dev libdbus-1-dev libicu-dev xorg-dev - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v1 - with: - languages: ${{ matrix.language }} - - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v1 - - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 https://git.io/JvXDl - - # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language - - #- run: | - # make bootstrap - # make release - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 diff --git a/CMakeLists.txt b/CMakeLists.txt index 05927fd75..d4e9c5d39 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -102,7 +102,7 @@ if(NOT KATIE_UNIFDEF) message(WARNING "Could not find unifdef, headers will not be optimized") endif() -# used as shebang for profile, exec, dbus, xvfb and dbg scripts +# used as shebang for profile, exec and dbg scripts find_program(KATIE_SHELL NAMES sh dash mksh ksh ash) if(NOT KATIE_SHELL) message(FATAL_ERROR "Could not detect shell, supported are: sh, dash, mksh, ksh and ash") @@ -377,7 +377,7 @@ if(KATIE_TESTS OR KATIE_BENCHMARKS) add_definitions(-DQT_BUILD_INTERNAL) endif() -foreach(script exec dbus xvfb dbg) +foreach(script exec dbg) configure_file( ${CMAKE_SOURCE_DIR}/cmake/${script}.sh.cmake ${CMAKE_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/${script}.sh diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index e85b3fe3b..000000000 --- a/appveyor.yml +++ /dev/null @@ -1,36 +0,0 @@ -version: 4.12.0-{branch}-{build} -image: Ubuntu2004 -clone_depth: 1 -cache: - - /home/appveyor/.ccache - -build_script: -- sh: >- - git log > /tmp/gitlog.txt - - grep -q '\[ci reset\]' /tmp/gitlog.txt && rm -rf /home/appveyor/.ccache - - sudo apt-get update -qq - - sudo apt-get install -qq libdeflate-dev libc6-dev \ - libpng-dev libcups2-dev libfreetype6-dev libfontconfig1-dev \ - libdbus-1-dev libicu-dev xorg-dev dbus-x11 libjansson-dev ccache \ - fonts-freefont-ttf - - export PATH="/usr/lib/ccache/:$PATH" - - python ./scripts/cicount.py - - cmake . -Wno-dev -DKATIE_TESTS=ON -DKATIE_BENCHMARKS=ON -DKATIE_UTILS=ON - - make -j $(nproc || echo 1) - -test_script: -- sh: >- - Xvfb :123 & - - export DISPLAY=:123 - - cd tests/auto - - ctest -V diff --git a/cmake/dbus.sh.cmake b/cmake/dbus.sh.cmake deleted file mode 100644 index 34aef5698..000000000 --- a/cmake/dbus.sh.cmake +++ /dev/null @@ -1,20 +0,0 @@ -#!@KATIE_SHELL@ - -set -e - -if [ -z "$LD_LIBRARY_PATH" ];then - export LD_LIBRARY_PATH="@CMAKE_BINARY_DIR@/lib" -else - export LD_LIBRARY_PATH="@CMAKE_BINARY_DIR@/lib:$LD_LIBRARY_PATH" -fi -export QT_PLUGIN_PATH="@CMAKE_BINARY_DIR@/plugins" -export QML_IMPORT_PATH="@CMAKE_BINARY_DIR@/imports" - -bin="$1" -shift - -cd "$(dirname "$bin")" -if [ -z "$DBUS_SESSION_BUS_ADDRESS" ];then - exec dbus-run-session -- @CMAKE_CROSSCOMPILING_EMULATOR@ "./$(basename "$bin")" "$@" -fi -exec @CMAKE_CROSSCOMPILING_EMULATOR@ "./$(basename "$bin")" "$@" diff --git a/cmake/modules/KatieBuildMacros.cmake b/cmake/modules/KatieBuildMacros.cmake index 676012063..b2e16e6ef 100644 --- a/cmake/modules/KatieBuildMacros.cmake +++ b/cmake/modules/KatieBuildMacros.cmake @@ -342,29 +342,6 @@ macro(KATIE_TEST TESTNAME TESTSOURCES) ) endmacro() -# a macro to add D-Bus tests easily by setting them up with the assumptions they make -macro(KATIE_DBUS_TEST TESTNAME TESTSOURCES) - katie_setup_target(${TESTNAME} ${TESTSOURCES} ${ARGN}) - - add_executable(${TESTNAME} ${${TESTNAME}_SOURCES}) - add_dependencies(${TESTNAME} plugins_dependant_tests) - - target_link_libraries(${TESTNAME} KtCore KtDBus KtTest) - target_compile_definitions( - ${TESTNAME} PRIVATE - -DSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" - ) - set_target_properties( - ${TESTNAME} PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" - ) - - add_test( - NAME ${TESTNAME} - COMMAND "${CMAKE_BINARY_DIR}/dbus.sh" "${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME}" - ) -endmacro() - # a macro to add tests that require GUI easily by setting them up with the assumptions they make macro(KATIE_GUI_TEST TESTNAME TESTSOURCES) katie_setup_target(${TESTNAME} ${TESTSOURCES} ${ARGN}) @@ -385,6 +362,6 @@ macro(KATIE_GUI_TEST TESTNAME TESTSOURCES) add_test( NAME ${TESTNAME} - COMMAND "${CMAKE_BINARY_DIR}/xvfb.sh" "${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME}" + COMMAND "${CMAKE_BINARY_DIR}/exec.sh" "${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME}" ) endmacro() diff --git a/cmake/xvfb.sh.cmake b/cmake/xvfb.sh.cmake deleted file mode 100644 index 85882be06..000000000 --- a/cmake/xvfb.sh.cmake +++ /dev/null @@ -1,28 +0,0 @@ -#!@KATIE_SHELL@ - -set -e - -if [ -z "$LD_LIBRARY_PATH" ];then - export LD_LIBRARY_PATH="@CMAKE_BINARY_DIR@/lib" -else - export LD_LIBRARY_PATH="@CMAKE_BINARY_DIR@/lib:$LD_LIBRARY_PATH" -fi -export QT_PLUGIN_PATH="@CMAKE_BINARY_DIR@/plugins" -export QML_IMPORT_PATH="@CMAKE_BINARY_DIR@/imports" - -bin="$1" -shift - -cd "$(dirname "$bin")" -if [ -z "$DISPLAY" ];then - Xvfb :123 & - xvfbpid=$! - sleep 5 - - retval=0 - DISPLAY=:123 @CMAKE_CROSSCOMPILING_EMULATOR@ "./$(basename "$bin")" "$@" || retval=$? - - kill $xvfbpid - exit $retval -fi -exec @CMAKE_CROSSCOMPILING_EMULATOR@ "./$(basename "$bin")" "$@" diff --git a/scripts/cicount.py b/scripts/cicount.py deleted file mode 100755 index cd44a58e6..000000000 --- a/scripts/cicount.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/python - -import os, sys - -cicountdir = "/home/appveyor/.ccache" -cicountfile = cicountdir + "/cicount" - -cicount = 0 -try: - with open(cicountfile, 'r') as f: - cicontent = f.read() - cicount = int(cicontent) -except: - cicount = 10 - -if cicount >= 10: - import randconfig - cicount = 0 - -if not os.path.isdir(cicountdir): - os.makedirs(cicountdir) -cicount += 1 -with open(cicountfile, 'w') as f: - f.write(str(cicount)) diff --git a/tests/auto/qdbusabstractadaptor/CMakeLists.txt b/tests/auto/qdbusabstractadaptor/CMakeLists.txt index 8dbf0fd94..343fb8561 100644 --- a/tests/auto/qdbusabstractadaptor/CMakeLists.txt +++ b/tests/auto/qdbusabstractadaptor/CMakeLists.txt @@ -1,9 +1,11 @@ if(WITH_DBUS AND DBUS_FOUND) - katie_dbus_test(tst_qdbusabstractadaptor + katie_test(tst_qdbusabstractadaptor ${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbusabstractadaptor.cpp ${CMAKE_CURRENT_SOURCE_DIR}/myobject.h ) + target_link_libraries(tst_qdbusabstractadaptor KtDBus) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) katie_setup_target(qdbusabstractadaptor_qmyserver ${CMAKE_CURRENT_SOURCE_DIR}/qmyserver/qmyserver.cpp diff --git a/tests/auto/qdbusabstractinterface/CMakeLists.txt b/tests/auto/qdbusabstractinterface/CMakeLists.txt index a497d7a90..c673cb09b 100644 --- a/tests/auto/qdbusabstractinterface/CMakeLists.txt +++ b/tests/auto/qdbusabstractinterface/CMakeLists.txt @@ -1,5 +1,5 @@ if(WITH_DBUS AND DBUS_FOUND) - katie_dbus_test(tst_qdbusabstractinterface + katie_test(tst_qdbusabstractinterface ${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbusabstractinterface.cpp ${CMAKE_CURRENT_SOURCE_DIR}/interface.cpp ${CMAKE_CURRENT_SOURCE_DIR}/interface.h @@ -7,6 +7,8 @@ if(WITH_DBUS AND DBUS_FOUND) ${CMAKE_CURRENT_SOURCE_DIR}/pinger.h ) + target_link_libraries(tst_qdbusabstractinterface KtDBus) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) katie_setup_target(qdbusabstractinterface_qpinger ${CMAKE_CURRENT_SOURCE_DIR}/qpinger/qpinger.cpp diff --git a/tests/auto/qdbusconnection/CMakeLists.txt b/tests/auto/qdbusconnection/CMakeLists.txt index 91cbb88e9..956cc79e6 100644 --- a/tests/auto/qdbusconnection/CMakeLists.txt +++ b/tests/auto/qdbusconnection/CMakeLists.txt @@ -1,5 +1,7 @@ if(WITH_DBUS AND DBUS_FOUND) - katie_dbus_test(tst_qdbusconnection + katie_test(tst_qdbusconnection ${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbusconnection.cpp ) + + target_link_libraries(tst_qdbusconnection KtDBus) endif() \ No newline at end of file diff --git a/tests/auto/qdbuscontext/CMakeLists.txt b/tests/auto/qdbuscontext/CMakeLists.txt index b3b8ed6a2..1f022679c 100644 --- a/tests/auto/qdbuscontext/CMakeLists.txt +++ b/tests/auto/qdbuscontext/CMakeLists.txt @@ -1,5 +1,7 @@ if(WITH_DBUS AND DBUS_FOUND) - katie_dbus_test(tst_qdbuscontext + katie_test(tst_qdbuscontext ${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbuscontext.cpp ) + + target_link_libraries(tst_qdbuscontext KtDBus) endif() \ No newline at end of file diff --git a/tests/auto/qdbusinterface/CMakeLists.txt b/tests/auto/qdbusinterface/CMakeLists.txt index 09b7b9f5a..13ced36f1 100644 --- a/tests/auto/qdbusinterface/CMakeLists.txt +++ b/tests/auto/qdbusinterface/CMakeLists.txt @@ -1,9 +1,11 @@ if(WITH_DBUS AND DBUS_FOUND) - katie_dbus_test(tst_qdbusinterface + katie_test(tst_qdbusinterface ${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbusinterface.cpp ${CMAKE_CURRENT_SOURCE_DIR}/myobject.h ) + target_link_libraries(tst_qdbusinterface KtDBus) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) katie_setup_target(qdbusinterface_qmyserver ${CMAKE_CURRENT_SOURCE_DIR}/qmyserver/qmyserver.cpp diff --git a/tests/auto/qdbuslocalcalls/CMakeLists.txt b/tests/auto/qdbuslocalcalls/CMakeLists.txt index 82270d994..1af0c1861 100644 --- a/tests/auto/qdbuslocalcalls/CMakeLists.txt +++ b/tests/auto/qdbuslocalcalls/CMakeLists.txt @@ -1,5 +1,7 @@ if(WITH_DBUS AND DBUS_FOUND) - katie_dbus_test(tst_qdbuslocalcalls + katie_test(tst_qdbuslocalcalls ${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbuslocalcalls.cpp ) + + target_link_libraries(tst_qdbuslocalcalls KtDBus) endif() \ No newline at end of file diff --git a/tests/auto/qdbusmarshall/CMakeLists.txt b/tests/auto/qdbusmarshall/CMakeLists.txt index cd169ec2b..d69a155c2 100644 --- a/tests/auto/qdbusmarshall/CMakeLists.txt +++ b/tests/auto/qdbusmarshall/CMakeLists.txt @@ -1,12 +1,12 @@ if(WITH_DBUS AND DBUS_FOUND) include_directories(${DBUS_INCLUDES}) - katie_dbus_test(tst_qdbusmarshall + katie_test(tst_qdbusmarshall ${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbusmarshall.cpp ${CMAKE_CURRENT_SOURCE_DIR}/common.h ) - target_link_libraries(tst_qdbusmarshall ${DBUS_LIBRARIES}) + target_link_libraries(tst_qdbusmarshall KtDBus ${DBUS_LIBRARIES}) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) katie_setup_target(qdbusmarshall_qpong diff --git a/tests/auto/qdbusmetaobject/CMakeLists.txt b/tests/auto/qdbusmetaobject/CMakeLists.txt index f9c8d94ec..d6d002a79 100644 --- a/tests/auto/qdbusmetaobject/CMakeLists.txt +++ b/tests/auto/qdbusmetaobject/CMakeLists.txt @@ -1,5 +1,7 @@ if(WITH_DBUS AND DBUS_FOUND) - katie_dbus_test(tst_qdbusmetaobject + katie_test(tst_qdbusmetaobject ${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbusmetaobject.cpp ) + + target_link_libraries(tst_qdbusmetaobject KtDBus) endif() diff --git a/tests/auto/qdbusmetatype/CMakeLists.txt b/tests/auto/qdbusmetatype/CMakeLists.txt index 40bcc3cd7..d2db31e0f 100644 --- a/tests/auto/qdbusmetatype/CMakeLists.txt +++ b/tests/auto/qdbusmetatype/CMakeLists.txt @@ -1,5 +1,7 @@ if(WITH_DBUS AND DBUS_FOUND) - katie_dbus_test(tst_qdbusmetatype + katie_test(tst_qdbusmetatype ${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbusmetatype.cpp ) + + target_link_libraries(tst_qdbusmetatype KtDBus) endif() diff --git a/tests/auto/qdbuspendingcall/CMakeLists.txt b/tests/auto/qdbuspendingcall/CMakeLists.txt index 7e1917ee9..f1041eb02 100644 --- a/tests/auto/qdbuspendingcall/CMakeLists.txt +++ b/tests/auto/qdbuspendingcall/CMakeLists.txt @@ -1,5 +1,7 @@ if(WITH_DBUS AND DBUS_FOUND) - katie_dbus_test(tst_qdbuspendingcall + katie_test(tst_qdbuspendingcall ${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbuspendingcall.cpp ) + + target_link_libraries(tst_qdbuspendingcall KtDBus) endif() diff --git a/tests/auto/qdbusreply/CMakeLists.txt b/tests/auto/qdbusreply/CMakeLists.txt index 843fcfc15..4b68a25d6 100644 --- a/tests/auto/qdbusreply/CMakeLists.txt +++ b/tests/auto/qdbusreply/CMakeLists.txt @@ -1,5 +1,7 @@ if(WITH_DBUS AND DBUS_FOUND) - katie_dbus_test(tst_qdbusreply + katie_test(tst_qdbusreply ${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbusreply.cpp ) + + target_link_libraries(tst_qdbusreply KtDBus) endif() diff --git a/tests/auto/qdbusservicewatcher/CMakeLists.txt b/tests/auto/qdbusservicewatcher/CMakeLists.txt index 88df6a063..3eca83bdd 100644 --- a/tests/auto/qdbusservicewatcher/CMakeLists.txt +++ b/tests/auto/qdbusservicewatcher/CMakeLists.txt @@ -1,5 +1,7 @@ if(WITH_DBUS AND DBUS_FOUND) - katie_dbus_test(tst_qdbusservicewatcher + katie_test(tst_qdbusservicewatcher ${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbusservicewatcher.cpp ) + + target_link_libraries(tst_qdbusservicewatcher KtDBus) endif() diff --git a/tests/auto/qdbusthreading/CMakeLists.txt b/tests/auto/qdbusthreading/CMakeLists.txt index 6d89b5292..52dc04915 100644 --- a/tests/auto/qdbusthreading/CMakeLists.txt +++ b/tests/auto/qdbusthreading/CMakeLists.txt @@ -1,5 +1,7 @@ if(WITH_DBUS AND DBUS_FOUND) - katie_dbus_test(tst_qdbusthreading + katie_test(tst_qdbusthreading ${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbusthreading.cpp ) + + target_link_libraries(tst_qdbusthreading KtDBus) endif() diff --git a/tests/auto/qdbustype/CMakeLists.txt b/tests/auto/qdbustype/CMakeLists.txt index 90b2f3e96..f54f6c226 100644 --- a/tests/auto/qdbustype/CMakeLists.txt +++ b/tests/auto/qdbustype/CMakeLists.txt @@ -1,9 +1,9 @@ if(WITH_DBUS AND DBUS_FOUND) include_directories(${DBUS_INCLUDES}) - katie_dbus_test(tst_qdbustype + katie_test(tst_qdbustype ${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbustype.cpp ) - target_link_libraries(tst_qdbustype ${DBUS_LIBRARIES}) + target_link_libraries(tst_qdbustype KtDBus ${DBUS_LIBRARIES}) endif() diff --git a/tests/auto/qdbusxmlparser/CMakeLists.txt b/tests/auto/qdbusxmlparser/CMakeLists.txt index f68d5f201..eb012b5fb 100644 --- a/tests/auto/qdbusxmlparser/CMakeLists.txt +++ b/tests/auto/qdbusxmlparser/CMakeLists.txt @@ -1,5 +1,7 @@ if(WITH_DBUS AND DBUS_FOUND) - katie_dbus_test(tst_qdbusxmlparser + katie_test(tst_qdbusxmlparser ${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbusxmlparser.cpp ) + + target_link_libraries(tst_qdbusxmlparser KtDBus) endif() diff --git a/tests/benchmarks/dbus/qdbusperformance/CMakeLists.txt b/tests/benchmarks/dbus/qdbusperformance/CMakeLists.txt index 6837f0153..d8e5ba6fe 100644 --- a/tests/benchmarks/dbus/qdbusperformance/CMakeLists.txt +++ b/tests/benchmarks/dbus/qdbusperformance/CMakeLists.txt @@ -1,9 +1,11 @@ if(WITH_DBUS AND DBUS_FOUND) - katie_dbus_test(tst_qdbusperformance + katie_test(tst_qdbusperformance ${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbusperformance.cpp ${CMAKE_CURRENT_SOURCE_DIR}/serverobject.h ) + target_link_libraries(tst_qdbusperformance KtDBus) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) katie_setup_target(performance_server ${CMAKE_CURRENT_SOURCE_DIR}/server/server.cpp diff --git a/tests/benchmarks/dbus/qdbustype/CMakeLists.txt b/tests/benchmarks/dbus/qdbustype/CMakeLists.txt index c72deca91..3190ed1ea 100644 --- a/tests/benchmarks/dbus/qdbustype/CMakeLists.txt +++ b/tests/benchmarks/dbus/qdbustype/CMakeLists.txt @@ -1,8 +1,9 @@ if(WITH_DBUS AND DBUS_FOUND) - katie_dbus_test(tst_bench_qdbustype + include_directories(${DBUS_INCLUDES}) + + katie_test(tst_bench_qdbustype ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp ) - target_link_libraries(tst_bench_qdbustype ${DBUS_LIBRARIES}) - include_directories(${DBUS_INCLUDES}) + target_link_libraries(tst_bench_qdbustype KtDBus ${DBUS_LIBRARIES}) endif()