From c59a38473e8427710bfb874fd23c43df013c5d50 Mon Sep 17 00:00:00 2001 From: Adam Nash Date: Sat, 18 Feb 2023 12:07:56 -0500 Subject: [PATCH 01/12] docs: add github action badges --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6f944d03..b83e372f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,11 @@ [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release) -[![Discord Chat](https://discordapp.com/api/guilds/672761400220844042/widget.png?style=shield)](https://discord.gg/wRQJpZZ) +[![Discord Chat](https://discordapp.com/api/guilds/672761400220844042/widget.png?style=shield)](https://discord.gg/wRQJpZZ) + +| master | develop | +| ------ | ------- | +|![main](https://github.com/Mahlet-Inc/hobbits/actions/workflows/prod-build.yml/badge.svg)|![main](https://github.com/Mahlet-Inc/hobbits/actions/workflows/dev-build.yml/badge.svg?event=push)| + ## About Hobbits was developed at Mahlet in 2019 as an integrated data analysis tool. It was open-sourced From e883e120e556ac0acf63a5b4e757ca2db69e2840 Mon Sep 17 00:00:00 2001 From: Adam Nash Date: Sat, 18 Feb 2023 12:15:56 -0500 Subject: [PATCH 02/12] ci: try to build on Ubuntu 20.04 --- .github/workflows/dev-build.yml | 4 ++-- .github/workflows/prod-build.yml | 4 ++-- README.md | 8 ++------ 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml index 85304f7f..c196965e 100644 --- a/.github/workflows/dev-build.yml +++ b/.github/workflows/dev-build.yml @@ -1,4 +1,4 @@ -name: Build Hobbits +name: Build and Test develop run-name: Build ${{ github.ref }} ${{ github.sha }} on: push: @@ -9,7 +9,7 @@ on: - develop jobs: Build-Hobbits: - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 steps: - uses: actions/setup-node@v3 with: diff --git a/.github/workflows/prod-build.yml b/.github/workflows/prod-build.yml index 93e05513..0ee6f956 100644 --- a/.github/workflows/prod-build.yml +++ b/.github/workflows/prod-build.yml @@ -1,4 +1,4 @@ -name: Build and Deploy Hobbits +name: Build, Test and Release master run-name: Deploy ${{ github.ref }} ${{ github.sha }} on: push: @@ -6,7 +6,7 @@ on: - master jobs: Build-Hobbits: - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 steps: - uses: actions/setup-node@v3 with: diff --git a/README.md b/README.md index b83e372f..1691e104 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,6 @@ - -[![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release) [![Discord Chat](https://discordapp.com/api/guilds/672761400220844042/widget.png?style=shield)](https://discord.gg/wRQJpZZ) - -| master | develop | -| ------ | ------- | -|![main](https://github.com/Mahlet-Inc/hobbits/actions/workflows/prod-build.yml/badge.svg)|![main](https://github.com/Mahlet-Inc/hobbits/actions/workflows/dev-build.yml/badge.svg?event=push)| +![build, test, release master](https://github.com/Mahlet-Inc/hobbits/actions/workflows/prod-build.yml/badge.svg) +![build, test develop](https://github.com/Mahlet-Inc/hobbits/actions/workflows/dev-build.yml/badge.svg?event=push)| ## About From 5e28710e5e9ecb376c2d9ab0c61332e439369f2c Mon Sep 17 00:00:00 2001 From: Adam Nash Date: Sat, 18 Feb 2023 12:18:56 -0500 Subject: [PATCH 03/12] build: python 3.8 is probably fine? --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1691e104..45968d28 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![Discord Chat](https://discordapp.com/api/guilds/672761400220844042/widget.png?style=shield)](https://discord.gg/wRQJpZZ) ![build, test, release master](https://github.com/Mahlet-Inc/hobbits/actions/workflows/prod-build.yml/badge.svg) -![build, test develop](https://github.com/Mahlet-Inc/hobbits/actions/workflows/dev-build.yml/badge.svg?event=push)| +![build, test develop](https://github.com/Mahlet-Inc/hobbits/actions/workflows/dev-build.yml/badge.svg?event=push) ## About From 53b2f77aa5d092a22c64dcee69e90f46d7aee801 Mon Sep 17 00:00:00 2001 From: Adam Nash Date: Sat, 18 Feb 2023 12:19:44 -0500 Subject: [PATCH 04/12] build: python 3.8 is probably fine --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f8e5b293..ea5909fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -167,7 +167,7 @@ elseif( MANUAL_PYTHON_PATH ) set ( Python3_ROOT_DIR "${MANUAL_PYTHON_PATH}" ) endif() -find_package (Python3 3.9 COMPONENTS Interpreter Development REQUIRED) +find_package (Python3 3.8 COMPONENTS Interpreter Development REQUIRED) message("Python3 Libs: ${Python3_LIBRARIES}") # From 51fa923199162f65228a78e6376b6c14bb9779c2 Mon Sep 17 00:00:00 2001 From: Adam Nash Date: Sat, 18 Feb 2023 12:30:20 -0500 Subject: [PATCH 05/12] docs: add links to build-test badges --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 45968d28..3e22db51 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![Discord Chat](https://discordapp.com/api/guilds/672761400220844042/widget.png?style=shield)](https://discord.gg/wRQJpZZ) -![build, test, release master](https://github.com/Mahlet-Inc/hobbits/actions/workflows/prod-build.yml/badge.svg) -![build, test develop](https://github.com/Mahlet-Inc/hobbits/actions/workflows/dev-build.yml/badge.svg?event=push) +[![build, test, release master](https://github.com/Mahlet-Inc/hobbits/actions/workflows/prod-build.yml/badge.svg)](https://github.com/Mahlet-Inc/hobbits/actions/workflows/prod-build.yml) +[![build, test develop](https://github.com/Mahlet-Inc/hobbits/actions/workflows/dev-build.yml/badge.svg?event=push)](https://github.com/Mahlet-Inc/hobbits/actions/workflows/dev-build.yml) ## About From 91c3294f5ddfa3aeb000fa9eb7b8f337582e2d29 Mon Sep 17 00:00:00 2001 From: Adam Nash Date: Mon, 20 Feb 2023 12:12:04 -0500 Subject: [PATCH 06/12] ci: try multi-OS build --- .github/workflows/dev-build.yml | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml index c196965e..923169ba 100644 --- a/.github/workflows/dev-build.yml +++ b/.github/workflows/dev-build.yml @@ -9,7 +9,11 @@ on: - develop jobs: Build-Hobbits: - runs-on: ubuntu-20.04 + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-20.04, ubuntu-22.04] + steps: - uses: actions/setup-node@v3 with: @@ -41,5 +45,17 @@ jobs: run: ninja package -C build - uses: actions/upload-artifact@v3 with: - name: DEB Packages - path: build/hobbits-*deb* \ No newline at end of file + name: DEB Packages ${{ matrix.os }} + path: build/hobbits-*deb* + + Check-Artifacts: + needs: Build-Hobbits + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@v3 + + - uses: actions/download-artifact@v3 + + - name: Display structure of downloaded files + run: ls -R + From 1129cffa0d20d6b7ba4314a05aedb43abef83214 Mon Sep 17 00:00:00 2001 From: Adam Nash Date: Mon, 20 Feb 2023 12:42:56 -0500 Subject: [PATCH 07/12] ci: do separate 20.04 and 22.04 artifacts --- .github/workflows/dev-build.yml | 2 +- .github/workflows/prod-build.yml | 23 +++++++++++++++++++++-- ci/full.releaserc.json | 7 ++++++- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml index 923169ba..70d755ff 100644 --- a/.github/workflows/dev-build.yml +++ b/.github/workflows/dev-build.yml @@ -56,6 +56,6 @@ jobs: - uses: actions/download-artifact@v3 - - name: Display structure of downloaded files + - name: Check Files run: ls -R diff --git a/.github/workflows/prod-build.yml b/.github/workflows/prod-build.yml index 0ee6f956..ff793633 100644 --- a/.github/workflows/prod-build.yml +++ b/.github/workflows/prod-build.yml @@ -6,7 +6,11 @@ on: - master jobs: Build-Hobbits: - runs-on: ubuntu-20.04 + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-20.04, ubuntu-22.04] + steps: - uses: actions/setup-node@v3 with: @@ -44,11 +48,26 @@ jobs: run: ninja package -C build - uses: actions/upload-artifact@v3 with: - name: DEB Packages + name: DEB Packages ${{ matrix.os }} path: build/hobbits-*deb* + Release-Hobbits: + needs: Build-Hobbits + runs-on: ubuntu-22.04 + steps: + - uses: actions/setup-node@v3 + with: + node-version: 14 + - uses: actions/checkout@v3 + + - uses: actions/download-artifact@v3 + + - name: Check Files + run: ls -R + - name: Semantic Release run: | + npm ci cp ci/full.releaserc.json .releaserc.json npx semantic-release env: diff --git a/ci/full.releaserc.json b/ci/full.releaserc.json index 50b48489..845eea79 100644 --- a/ci/full.releaserc.json +++ b/ci/full.releaserc.json @@ -25,7 +25,12 @@ { "assets": [ { - "path": "build/hobbits*deb*" + "path": "DEB Packages ubuntu-20.04/*.deb", + "name": "DEB Package for Ubuntu 20.04" + }, + { + "path": "DEB Packages ubuntu-22.04/*.deb", + "name": "DEB Package for Ubuntu 22.04" } ] } From 5ecad9742dd0c29afb0ded62f74462c838828e1d Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Wed, 8 Jun 2022 15:57:34 +0000 Subject: [PATCH 08/12] chore(release): 0.53.2 [skip ci] ## [0.53.2](https://github.com/Mahlet-Inc/hobbits/compare/v0.53.1...v0.53.2) (2022-06-08) ### Bug Fixes * correctly display kaitai value instances for [#145](https://github.com/Mahlet-Inc/hobbits/issues/145) ([556514b](https://github.com/Mahlet-Inc/hobbits/commit/556514b8a9192feaa0d88a8ec65083b90ebbab65)) * fix kaitai plugin byte and string array sizes ([fdc2b10](https://github.com/Mahlet-Inc/hobbits/commit/fdc2b10c373a66c110488026e3b130ee47e5d65e)) --- CHANGELOG.md | 8 ++++++++ package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1749b59e..25fb8e81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +## [0.53.2](https://github.com/Mahlet-Inc/hobbits/compare/v0.53.1...v0.53.2) (2022-06-08) + + +### Bug Fixes + +* correctly display kaitai value instances for [#145](https://github.com/Mahlet-Inc/hobbits/issues/145) ([556514b](https://github.com/Mahlet-Inc/hobbits/commit/556514b8a9192feaa0d88a8ec65083b90ebbab65)) +* fix kaitai plugin byte and string array sizes ([fdc2b10](https://github.com/Mahlet-Inc/hobbits/commit/fdc2b10c373a66c110488026e3b130ee47e5d65e)) + ## [0.53.1](https://github.com/Mahlet-Inc/hobbits/compare/v0.53.0...v0.53.1) (2022-03-06) diff --git a/package.json b/package.json index fad11652..f1ae80c6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hobbits", - "version": "0.53.1", + "version": "0.53.2", "private": true, "config": { "commitizen": { From 100ca23c13c544deb439ea3dc316355dc2ed06bf Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Fri, 17 Feb 2023 00:47:27 +0000 Subject: [PATCH 09/12] chore(release): 0.53.3 [skip ci] ## [0.53.3](https://github.com/Mahlet-Inc/hobbits/compare/v0.53.2...v0.53.3) (2023-02-17) ### Bug Fixes * add prod build action and force a minor version bump ([4be6f45](https://github.com/Mahlet-Inc/hobbits/commit/4be6f4522db12958caf48e7fc6d65692f5009355)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25fb8e81..8d2047b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [0.53.3](https://github.com/Mahlet-Inc/hobbits/compare/v0.53.2...v0.53.3) (2023-02-17) + + +### Bug Fixes + +* add prod build action and force a minor version bump ([4be6f45](https://github.com/Mahlet-Inc/hobbits/commit/4be6f4522db12958caf48e7fc6d65692f5009355)) + ## [0.53.2](https://github.com/Mahlet-Inc/hobbits/compare/v0.53.1...v0.53.2) (2022-06-08) diff --git a/package.json b/package.json index f1ae80c6..ec9bfffe 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hobbits", - "version": "0.53.2", + "version": "0.53.3", "private": true, "config": { "commitizen": { From a95692dfb9338d05722d9406f80e482c57a7a953 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Fri, 17 Feb 2023 01:01:51 +0000 Subject: [PATCH 10/12] chore(release): 0.53.4 [skip ci] ## [0.53.4](https://github.com/Mahlet-Inc/hobbits/compare/v0.53.3...v0.53.4) (2023-02-17) ### Bug Fixes * update the semantic release config and force a release ([59f69f5](https://github.com/Mahlet-Inc/hobbits/commit/59f69f53e480892c1e725996f06f8e976dc6efc3)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d2047b4..c22b926a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [0.53.4](https://github.com/Mahlet-Inc/hobbits/compare/v0.53.3...v0.53.4) (2023-02-17) + + +### Bug Fixes + +* update the semantic release config and force a release ([59f69f5](https://github.com/Mahlet-Inc/hobbits/commit/59f69f53e480892c1e725996f06f8e976dc6efc3)) + ## [0.53.3](https://github.com/Mahlet-Inc/hobbits/compare/v0.53.2...v0.53.3) (2023-02-17) diff --git a/package.json b/package.json index ec9bfffe..ee87d2c8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hobbits", - "version": "0.53.3", + "version": "0.53.4", "private": true, "config": { "commitizen": { From 28efc22809689212d9a5629e3d28472b17c2ae6c Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Fri, 17 Feb 2023 01:34:29 +0000 Subject: [PATCH 11/12] chore(release): 0.54.0 [skip ci] # [0.54.0](https://github.com/Mahlet-Inc/hobbits/compare/v0.53.4...v0.54.0) (2023-02-17) ### Features * add Edit plugin ([9c091e5](https://github.com/Mahlet-Inc/hobbits/commit/9c091e5db0d9f7052116065b8c5351fc56df0b47)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c22b926a..2a1ba4f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [0.54.0](https://github.com/Mahlet-Inc/hobbits/compare/v0.53.4...v0.54.0) (2023-02-17) + + +### Features + +* add Edit plugin ([9c091e5](https://github.com/Mahlet-Inc/hobbits/commit/9c091e5db0d9f7052116065b8c5351fc56df0b47)) + ## [0.53.4](https://github.com/Mahlet-Inc/hobbits/compare/v0.53.3...v0.53.4) (2023-02-17) diff --git a/package.json b/package.json index ee87d2c8..716c071b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hobbits", - "version": "0.53.4", + "version": "0.54.0", "private": true, "config": { "commitizen": { From 3d7a76810538c1214d3f84c35a3785831035d8bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20V=C3=A1zquez?= Date: Mon, 3 Jul 2023 20:58:07 +0200 Subject: [PATCH 12/12] Use versionless Qt cmake targets --- .github/workflows/dev-build.yml | 2 +- .github/workflows/prod-build.yml | 2 +- CMakeLists.txt | 4 +--- cmake/PackExternalDeps.cmake | 2 +- src/hobbits-core/CMakeLists.txt | 2 +- src/hobbits-gui/CMakeLists.txt | 2 +- src/hobbits-plugins/CMakeLists.txt | 2 +- src/hobbits-plugins/importerexporters/HttpData/CMakeLists.txt | 2 +- .../importerexporters/PacketCapture/CMakeLists.txt | 2 +- src/hobbits-plugins/importerexporters/TcpData/CMakeLists.txt | 2 +- src/hobbits-plugins/importerexporters/UdpData/CMakeLists.txt | 2 +- src/hobbits-runner/CMakeLists.txt | 2 +- 12 files changed, 12 insertions(+), 14 deletions(-) diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml index 70d755ff..7d9441d4 100644 --- a/.github/workflows/dev-build.yml +++ b/.github/workflows/dev-build.yml @@ -12,7 +12,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, ubuntu-22.04] + os: [ubuntu-22.04] steps: - uses: actions/setup-node@v3 diff --git a/.github/workflows/prod-build.yml b/.github/workflows/prod-build.yml index ff793633..dfcd4bca 100644 --- a/.github/workflows/prod-build.yml +++ b/.github/workflows/prod-build.yml @@ -9,7 +9,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, ubuntu-22.04] + os: [ubuntu-22.04] steps: - uses: actions/setup-node@v3 diff --git a/CMakeLists.txt b/CMakeLists.txt index ea5909fd..169621b5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -127,9 +127,7 @@ else() find_package(PkgConfig) # Qt - find_package(Qt5Core CONFIG REQUIRED) - find_package(Qt5Widgets CONFIG REQUIRED) - find_package(Qt5Network CONFIG REQUIRED) + find_package(Qt5 5.15 REQUIRED COMPONENTS Core Widgets Network) # libpcap if (NOT WIN32) diff --git a/cmake/PackExternalDeps.cmake b/cmake/PackExternalDeps.cmake index 330be03b..fa1326d3 100644 --- a/cmake/PackExternalDeps.cmake +++ b/cmake/PackExternalDeps.cmake @@ -1,7 +1,7 @@ function(pack_qt_libs) - get_target_property(QT_CORE_LIB Qt5::Core LOCATION) + get_target_property(QT_CORE_LIB Qt::Core LOCATION) if (APPLE) get_filename_component(CORE_FRAMEWORK_DIR "${QT_CORE_LIB}" DIRECTORY) get_filename_component(QT_LIB_DIR "${CORE_FRAMEWORK_DIR}" DIRECTORY) diff --git a/src/hobbits-core/CMakeLists.txt b/src/hobbits-core/CMakeLists.txt index c7e3bacc..bb617f60 100644 --- a/src/hobbits-core/CMakeLists.txt +++ b/src/hobbits-core/CMakeLists.txt @@ -23,7 +23,7 @@ target_include_directories(hobbits-core INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}") if (BUILDING_WITH_CONAN) set(ALL_LINK_LIBS CONAN_PKG::qt) else() - set(ALL_LINK_LIBS Qt5::Core Qt5::Widgets) + set(ALL_LINK_LIBS Qt::Core Qt::Widgets) endif() target_link_libraries(hobbits-core ${ALL_LINK_LIBS}) diff --git a/src/hobbits-gui/CMakeLists.txt b/src/hobbits-gui/CMakeLists.txt index 42357701..da8e5f8a 100644 --- a/src/hobbits-gui/CMakeLists.txt +++ b/src/hobbits-gui/CMakeLists.txt @@ -19,7 +19,7 @@ file(GLOB RCFILES "${CMAKE_CURRENT_SOURCE_DIR}/*.qrc" "${CMAKE_CURRENT_SOURCE_DI if (BUILDING_WITH_CONAN) set(ALL_LINK_LIBS hobbits-python hobbits-widgets hobbits-core CONAN_PKG::qt) else() - set(ALL_LINK_LIBS hobbits-python hobbits-widgets hobbits-core Qt5::Widgets) + set(ALL_LINK_LIBS hobbits-python hobbits-widgets hobbits-core Qt::Widgets) endif() add_executable(hobbits MACOSX_BUNDLE "${SRCFILES}" "${HDRFILES}" "${RCFILES}") diff --git a/src/hobbits-plugins/CMakeLists.txt b/src/hobbits-plugins/CMakeLists.txt index d0141a0e..11fcaaf2 100644 --- a/src/hobbits-plugins/CMakeLists.txt +++ b/src/hobbits-plugins/CMakeLists.txt @@ -18,7 +18,7 @@ macro(pluginInDir pluginType modName modDir) if (BUILDING_WITH_CONAN) set(ALL_LINK_LIBS hobbits-core hobbits-widgets CONAN_PKG::qt) else() - set(ALL_LINK_LIBS hobbits-core hobbits-widgets Qt5::Core Qt5::Widgets) + set(ALL_LINK_LIBS hobbits-core hobbits-widgets Qt::Core Qt::Widgets) endif() target_link_libraries("${pluginName}" PRIVATE ${ALL_LINK_LIBS}) diff --git a/src/hobbits-plugins/importerexporters/HttpData/CMakeLists.txt b/src/hobbits-plugins/importerexporters/HttpData/CMakeLists.txt index 5aeff0a3..4f2fcb23 100644 --- a/src/hobbits-plugins/importerexporters/HttpData/CMakeLists.txt +++ b/src/hobbits-plugins/importerexporters/HttpData/CMakeLists.txt @@ -1,6 +1,6 @@ pluginInDir("${pluginType}" "HttpData" "${CMAKE_CURRENT_SOURCE_DIR}") if (NOT BUILDING_WITH_CONAN) - target_link_libraries("hobbits-plugin-importerexporters-HttpData" PRIVATE Qt5::Network) + target_link_libraries("hobbits-plugin-importerexporters-HttpData" PRIVATE Qt::Network) endif() \ No newline at end of file diff --git a/src/hobbits-plugins/importerexporters/PacketCapture/CMakeLists.txt b/src/hobbits-plugins/importerexporters/PacketCapture/CMakeLists.txt index c7e4ec7a..e05d799c 100644 --- a/src/hobbits-plugins/importerexporters/PacketCapture/CMakeLists.txt +++ b/src/hobbits-plugins/importerexporters/PacketCapture/CMakeLists.txt @@ -5,7 +5,7 @@ if (NOT WIN32) if (BUILDING_WITH_CONAN) target_link_libraries("hobbits-plugin-importerexporters-PacketCapture" PRIVATE CONAN_PKG::libpcap) else() - target_link_libraries("hobbits-plugin-importerexporters-PacketCapture" PRIVATE ${PCAP_LIBRARY} Qt5::Network) + target_link_libraries("hobbits-plugin-importerexporters-PacketCapture" PRIVATE ${PCAP_LIBRARY} Qt::Network) endif() endif() diff --git a/src/hobbits-plugins/importerexporters/TcpData/CMakeLists.txt b/src/hobbits-plugins/importerexporters/TcpData/CMakeLists.txt index 9a7df4d9..068617e9 100644 --- a/src/hobbits-plugins/importerexporters/TcpData/CMakeLists.txt +++ b/src/hobbits-plugins/importerexporters/TcpData/CMakeLists.txt @@ -1,5 +1,5 @@ pluginInDir("${pluginType}" "TcpData" "${CMAKE_CURRENT_SOURCE_DIR}") if (NOT BUILDING_WITH_CONAN) - target_link_libraries("hobbits-plugin-importerexporters-TcpData" PRIVATE Qt5::Network) + target_link_libraries("hobbits-plugin-importerexporters-TcpData" PRIVATE Qt::Network) endif() diff --git a/src/hobbits-plugins/importerexporters/UdpData/CMakeLists.txt b/src/hobbits-plugins/importerexporters/UdpData/CMakeLists.txt index 8e9afa3d..d86f3b00 100644 --- a/src/hobbits-plugins/importerexporters/UdpData/CMakeLists.txt +++ b/src/hobbits-plugins/importerexporters/UdpData/CMakeLists.txt @@ -1,5 +1,5 @@ pluginInDir("${pluginType}" "UdpData" "${CMAKE_CURRENT_SOURCE_DIR}") if (NOT BUILDING_WITH_CONAN) - target_link_libraries("hobbits-plugin-importerexporters-UdpData" PRIVATE Qt5::Network) + target_link_libraries("hobbits-plugin-importerexporters-UdpData" PRIVATE Qt::Network) endif() diff --git a/src/hobbits-runner/CMakeLists.txt b/src/hobbits-runner/CMakeLists.txt index d42fe82a..b732b3b2 100644 --- a/src/hobbits-runner/CMakeLists.txt +++ b/src/hobbits-runner/CMakeLists.txt @@ -19,7 +19,7 @@ add_executable("hobbits-runner" "${SRCFILES}" "${HDRFILES}" "${RCFILES}") if (BUILDING_WITH_CONAN) set(ALL_LINK_LIBS hobbits-python hobbits-widgets hobbits-core CONAN_PKG::qt) else() - set(ALL_LINK_LIBS hobbits-python hobbits-widgets hobbits-core Qt5::Widgets) + set(ALL_LINK_LIBS hobbits-python hobbits-widgets hobbits-core Qt::Widgets) endif() target_link_libraries("hobbits-runner" ${ALL_LINK_LIBS})