From b6648fd18aa25d91a1ef5b49f43bd9ac4b5acfe6 Mon Sep 17 00:00:00 2001 From: Sirius Bakke Date: Sat, 22 Jul 2023 20:06:06 +0200 Subject: [PATCH] chore: Update CMakeLists.txt for Qt6 --- CMakeLists.txt | 12 +++++++++--- src/cisco_lib/CMakeLists.txt | 6 +++++- src/common/CMakeLists.txt | 6 +++++- src/compiler_lib/CMakeLists.txt | 6 +++++- src/fwbedit/CMakeLists.txt | 6 +++++- src/gui/CMakeLists.txt | 6 +++++- src/import/CMakeLists.txt | 6 +++++- src/iosacl/CMakeLists.txt | 6 +++++- src/ipf/CMakeLists.txt | 6 +++++- src/ipfw/CMakeLists.txt | 6 +++++- src/ipt/CMakeLists.txt | 6 +++++- src/iptlib/CMakeLists.txt | 6 +++++- src/juniper_lib/CMakeLists.txt | 6 +++++- src/junosacl/CMakeLists.txt | 6 +++++- src/libgui/CMakeLists.txt | 18 ++++++++++++++---- src/nxosacl/CMakeLists.txt | 6 +++++- src/parsers/CMakeLists.txt | 6 +++++- src/pf/CMakeLists.txt | 6 +++++- src/pflib/CMakeLists.txt | 6 +++++- src/pix/CMakeLists.txt | 6 +++++- src/procurve_acl/CMakeLists.txt | 6 +++++- .../AddressRangeDialogTest/CMakeLists.txt | 6 +++++- src/unit_tests/AddressTableTest/CMakeLists.txt | 6 +++++- src/unit_tests/CMakeLists.txt | 6 +++++- .../CustomServiceDialogTest/CMakeLists.txt | 6 +++++- src/unit_tests/DNSTest/CMakeLists.txt | 6 +++++- src/unit_tests/FWBTreeTest/CMakeLists.txt | 6 +++++- src/unit_tests/FWObjectTest/CMakeLists.txt | 6 +++++- .../FirewallDialogTest/CMakeLists.txt | 6 +++++- .../GroupObjectDialogTest/CMakeLists.txt | 6 +++++- .../ICMP6ServiceDialogTest/CMakeLists.txt | 6 +++++- .../ICMPServiceDialogTest/CMakeLists.txt | 6 +++++- src/unit_tests/IPDialogTest/CMakeLists.txt | 6 +++++- .../IPServiceDialogTest/CMakeLists.txt | 6 +++++- src/unit_tests/ImporterTest/CMakeLists.txt | 6 +++++- .../Inet6AddrMaskTest/CMakeLists.txt | 6 +++++- src/unit_tests/InetAddrMaskTest/CMakeLists.txt | 6 +++++- .../InterfaceDialogTest/CMakeLists.txt | 6 +++++- .../NetworkDialogTest/CMakeLists.txt | 6 +++++- .../ObjectManipulatorTest/CMakeLists.txt | 6 +++++- .../ObjectMatcherTest/CMakeLists.txt | 6 +++++- src/unit_tests/PFImporterTest/CMakeLists.txt | 6 +++++- src/unit_tests/PIXImporterTest/CMakeLists.txt | 6 +++++- src/unit_tests/RCS/CMakeLists.txt | 6 +++++- .../RuleSetViewContextMenuTest/CMakeLists.txt | 6 +++++- src/unit_tests/RuleSetViewTest/CMakeLists.txt | 6 +++++- .../TCPServiceDialogTest/CMakeLists.txt | 6 +++++- .../TagServiceDialogTest/CMakeLists.txt | 6 +++++- .../UDPServiceDialogTest/CMakeLists.txt | 6 +++++- .../UsageResolverTest/CMakeLists.txt | 6 +++++- .../UserSerivceDialogTest/CMakeLists.txt | 6 +++++- src/unit_tests/compilerLibTest/CMakeLists.txt | 6 +++++- .../CMakeLists.txt | 6 +++++- .../generatedScriptTestsIpfw/CMakeLists.txt | 6 +++++- .../generatedScriptTestsLinux/CMakeLists.txt | 6 +++++- .../generatedScriptTestsPF/CMakeLists.txt | 6 +++++- .../CMakeLists.txt | 6 +++++- .../genericDialogTest/CMakeLists.txt | 6 +++++- .../instDialogClusterTest/CMakeLists.txt | 6 +++++- .../instDialogCompileTest/CMakeLists.txt | 6 +++++- .../instDialogInspectTest/CMakeLists.txt | 6 +++++- .../instDialogInstallTest/CMakeLists.txt | 6 +++++- .../instDialogObjectListTest/CMakeLists.txt | 6 +++++- src/unit_tests/main/CMakeLists.txt | 6 +++++- .../newClusterDialogTest/CMakeLists.txt | 6 +++++- .../parseCommandLineTest/CMakeLists.txt | 6 +++++- .../startTipDialogTest/CMakeLists.txt | 6 +++++- 67 files changed, 348 insertions(+), 72 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e365b74b..ea7df47f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,9 +29,15 @@ include( CTest ) ### Dependencies -find_package(Qt5Widgets REQUIRED) -find_package(Qt5Network REQUIRED) -find_package(Qt5PrintSupport REQUIRED) +option(UseQt6 "Use Qt6" OFF) +if (UseQt6) + find_package(Qt6 COMPONENTS Widgets Network PrintSupport REQUIRED) +else() + find_package(Qt5Widgets REQUIRED) + find_package(Qt5Network REQUIRED) + find_package(Qt5PrintSupport REQUIRED) +endif() + find_package(LibXml2 REQUIRED) find_package(LibXslt REQUIRED) diff --git a/src/cisco_lib/CMakeLists.txt b/src/cisco_lib/CMakeLists.txt index 4ad2eb13f..3fc0e2279 100644 --- a/src/cisco_lib/CMakeLists.txt +++ b/src/cisco_lib/CMakeLists.txt @@ -69,7 +69,11 @@ target_include_directories(fwbcisco PUBLIC $ $/..) -target_link_libraries(fwbcisco compilerdriver Qt5::Core) +IF (UseQt6) + target_link_libraries(fwbcisco compilerdriver Qt6::Core) +ELSE() + target_link_libraries(fwbcisco compilerdriver Qt5::Core) +ENDIF() target_compile_options(fwbcisco PRIVATE ${CXX_DEFAULT_FLAGS}) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 3a2a236ec..f5e90f42c 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -7,7 +7,11 @@ add_library(common STATIC ${common_srcs}) target_include_directories(common PRIVATE $) -target_link_libraries(common fwbuilder Qt5::Core) +IF (UseQt6) + target_link_libraries(common fwbuilder Qt6::Core) +ELSE() + target_link_libraries(common fwbuilder Qt5::Core) +ENDIF() target_compile_options(common PRIVATE ${CXX_DEFAULT_FLAGS}) diff --git a/src/compiler_lib/CMakeLists.txt b/src/compiler_lib/CMakeLists.txt index 42b4978e6..aee5d72cf 100644 --- a/src/compiler_lib/CMakeLists.txt +++ b/src/compiler_lib/CMakeLists.txt @@ -21,7 +21,11 @@ add_library(compilerdriver STATIC ${compiler_lib_srcs}) target_include_directories(compilerdriver PUBLIC $) -target_link_libraries(compilerdriver fwbuilder Qt5::Core) +IF (UseQt6) + target_link_libraries(compilerdriver fwbuilder Qt6::Core) +ELSE() + target_link_libraries(compilerdriver fwbuilder Qt5::Core) +ENDIF() target_compile_options(compilerdriver PRIVATE ${CXX_DEFAULT_FLAGS}) diff --git a/src/fwbedit/CMakeLists.txt b/src/fwbedit/CMakeLists.txt index 07c68a9ef..9dc4916d0 100644 --- a/src/fwbedit/CMakeLists.txt +++ b/src/fwbedit/CMakeLists.txt @@ -12,7 +12,11 @@ set(fwbedit_srcs add_executable(fwbedit ${fwbedit_srcs}) -target_link_libraries(fwbedit gui import fwbparser antlr common iptlib fwbpf fwbcisco compilerdriver fwcompiler fwbuilder xml2 m xslt z OpenSSL::Crypto pthread Qt5::Core Qt5::Widgets Qt5::PrintSupport) +IF (UseQt6) + target_link_libraries(fwbedit gui import fwbparser antlr common iptlib fwbpf fwbcisco compilerdriver fwcompiler fwbuilder xml2 m xslt z OpenSSL::Crypto pthread Qt6::Core Qt6::Widgets Qt6::PrintSupport) +ELSE() + target_link_libraries(fwbedit gui import fwbparser antlr common iptlib fwbpf fwbcisco compilerdriver fwcompiler fwbuilder xml2 m xslt z OpenSSL::Crypto pthread Qt5::Core Qt5::Widgets Qt5::PrintSupport) +ENDIF() IF (WIN32) target_link_libraries(fwbedit lzma iconv) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index fd8e2f66d..07caa1659 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -13,7 +13,11 @@ else() add_executable(fwbuilder-gui ${fwbuilder-gui_srcs}) endif() -target_link_libraries(fwbuilder-gui gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 m xslt z OpenSSL::Crypto pthread Qt5::Core Qt5::Widgets Qt5::Network Qt5::PrintSupport) +IF (UseQt6) + target_link_libraries(fwbuilder-gui gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 m xslt z OpenSSL::Crypto pthread Qt6::Core Qt6::Widgets Qt6::Network Qt6::PrintSupport) +ELSE() + target_link_libraries(fwbuilder-gui gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 m xslt z OpenSSL::Crypto pthread Qt5::Core Qt5::Widgets Qt5::Network Qt5::PrintSupport) +ENDIF() IF (WIN32) target_link_libraries(fwbuilder-gui lzma iconv) diff --git a/src/import/CMakeLists.txt b/src/import/CMakeLists.txt index 24baf31a5..bc2eb2c5f 100644 --- a/src/import/CMakeLists.txt +++ b/src/import/CMakeLists.txt @@ -23,7 +23,11 @@ add_library(import STATIC ${import_srcs}) target_include_directories(import PUBLIC $) -target_link_libraries(import compilerdriver antlr Qt5::Core Qt5::Widgets) +IF (UseQt6) + target_link_libraries(import compilerdriver antlr Qt6::Core Qt6::Widgets) +ELSE() + target_link_libraries(import compilerdriver antlr Qt5::Core Qt5::Widgets) +ENDIF() target_compile_options(import PRIVATE ${CXX_DEFAULT_FLAGS}) diff --git a/src/iosacl/CMakeLists.txt b/src/iosacl/CMakeLists.txt index 6cc6f1270..ebaa26c51 100644 --- a/src/iosacl/CMakeLists.txt +++ b/src/iosacl/CMakeLists.txt @@ -3,7 +3,11 @@ set(iosacl_srcs add_executable(fwb_iosacl ${iosacl_srcs}) -target_link_libraries(fwb_iosacl common fwbcisco compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z Qt5::Core Qt5::Widgets) +IF (UseQt6) + target_link_libraries(fwb_iosacl common fwbcisco compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z Qt6::Core Qt6::Widgets) +ELSE() + target_link_libraries(fwb_iosacl common fwbcisco compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z Qt5::Core Qt5::Widgets) +ENDIF() IF (WIN32) target_link_libraries(fwb_iosacl lzma iconv ws2_32) diff --git a/src/ipf/CMakeLists.txt b/src/ipf/CMakeLists.txt index 7432026fa..110606867 100644 --- a/src/ipf/CMakeLists.txt +++ b/src/ipf/CMakeLists.txt @@ -3,7 +3,11 @@ set(ipf_srcs add_executable(fwb_ipf ${ipf_srcs}) -target_link_libraries(fwb_ipf common fwbpf compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z Qt5::Core Qt5::Widgets) +IF (UseQt6) + target_link_libraries(fwb_ipf common fwbpf compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z Qt6::Core Qt6::Widgets) +ELSE() + target_link_libraries(fwb_ipf common fwbpf compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z Qt5::Core Qt5::Widgets) +ENDIF() IF (WIN32) target_link_libraries(fwb_ipf lzma iconv ws2_32) diff --git a/src/ipfw/CMakeLists.txt b/src/ipfw/CMakeLists.txt index db69b6d7c..67d07d065 100644 --- a/src/ipfw/CMakeLists.txt +++ b/src/ipfw/CMakeLists.txt @@ -3,7 +3,11 @@ set(ipfw_srcs add_executable(fwb_ipfw ${ipfw_srcs}) -target_link_libraries(fwb_ipfw common fwbpf compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z Qt5::Core Qt5::Widgets) +IF (UseQt6) + target_link_libraries(fwb_ipfw common fwbpf compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z Qt6::Core Qt6::Widgets) +ELSE() + target_link_libraries(fwb_ipfw common fwbpf compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z Qt5::Core Qt5::Widgets) +ENDIF() IF (WIN32) target_link_libraries(fwb_ipfw lzma iconv ws2_32) diff --git a/src/ipt/CMakeLists.txt b/src/ipt/CMakeLists.txt index b6c1c8ab7..1c3a7f585 100644 --- a/src/ipt/CMakeLists.txt +++ b/src/ipt/CMakeLists.txt @@ -3,7 +3,11 @@ set(ipt_srcs add_executable(fwb_ipt ${ipt_srcs}) -target_link_libraries(fwb_ipt common iptlib compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z Qt5::Core Qt5::Widgets) +IF (UseQt6) + target_link_libraries(fwb_ipt common iptlib compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z Qt6::Core Qt6::Widgets) +ELSE() + target_link_libraries(fwb_ipt common iptlib compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z Qt5::Core Qt5::Widgets) +ENDIF() IF (WIN32) target_link_libraries(fwb_ipt lzma iconv) diff --git a/src/iptlib/CMakeLists.txt b/src/iptlib/CMakeLists.txt index e35780f2a..b78edb816 100644 --- a/src/iptlib/CMakeLists.txt +++ b/src/iptlib/CMakeLists.txt @@ -31,7 +31,11 @@ add_library(iptlib STATIC ${iptlib_srcs}) target_include_directories(iptlib PUBLIC $) -target_link_libraries(iptlib compilerdriver Qt5::Core) +IF (UseQt6) + target_link_libraries(iptlib compilerdriver Qt6::Core) +ELSE() + target_link_libraries(iptlib compilerdriver Qt5::Core) +ENDIF() IF (WIN32) target_link_libraries(iptlib compilerdriver ws2_32) diff --git a/src/juniper_lib/CMakeLists.txt b/src/juniper_lib/CMakeLists.txt index e125ca546..ead24d705 100644 --- a/src/juniper_lib/CMakeLists.txt +++ b/src/juniper_lib/CMakeLists.txt @@ -22,7 +22,11 @@ add_library(fwbjuniper STATIC ${juniper_lib_srcs}) target_include_directories(fwbjuniper PUBLIC $) -target_link_libraries(fwbjuniper fwbcisco compilerdriver Qt5::Core) +IF (UseQt6) + target_link_libraries(fwbjuniper fwbcisco compilerdriver Qt6::Core) +ELSE() + target_link_libraries(fwbjuniper fwbcisco compilerdriver Qt5::Core) +ENDIF() target_compile_options(fwbjuniper PRIVATE ${CXX_DEFAULT_FLAGS}) diff --git a/src/junosacl/CMakeLists.txt b/src/junosacl/CMakeLists.txt index 2f8fc590c..140ac444b 100644 --- a/src/junosacl/CMakeLists.txt +++ b/src/junosacl/CMakeLists.txt @@ -4,7 +4,11 @@ set(junosacl_srcs add_executable(fwb_junosacl ${junosacl_srcs}) -target_link_libraries(fwb_junosacl common fwbcisco fwbjuniper compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z Qt5::Core Qt5::Widgets) +IF (UseQt6) + target_link_libraries(fwb_junosacl common fwbcisco fwbjuniper compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z Qt6::Core Qt6::Widgets) +ELSE() + target_link_libraries(fwb_junosacl common fwbcisco fwbjuniper compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z Qt5::Core Qt5::Widgets) +ENDIF() IF (WIN32) target_link_libraries(fwb_junosacl iconv lzma ws2_32) diff --git a/src/libgui/CMakeLists.txt b/src/libgui/CMakeLists.txt index 170c5dfea..4fc8d1cf9 100644 --- a/src/libgui/CMakeLists.txt +++ b/src/libgui/CMakeLists.txt @@ -566,9 +566,15 @@ set(libgui_resources set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOUIC ON) -qt5_wrap_cpp(libgui_hdrs_moc ${libgui_hdrs}) -qt5_wrap_ui(libgui_ui_h ${libgui_ui}) -qt5_add_resources(libgui_resources_rcc ${libgui_resources}) +IF (UseQt6) + qt_wrap_cpp(libgui_hdrs_moc ${libgui_hdrs}) + qt_wrap_ui(libgui_ui_h ${libgui_ui}) + qt_add_resources(libgui_resources_rcc ${libgui_resources}) +ELSE() + qt5_wrap_cpp(libgui_hdrs_moc ${libgui_hdrs}) + qt5_wrap_ui(libgui_ui_h ${libgui_ui}) + qt5_add_resources(libgui_resources_rcc ${libgui_resources}) +ENDIF() add_library(gui STATIC ${libgui_srcs} ${libgui_hdrs_moc} ${libgui_ui_h} ${libgui_resources_rcc}) @@ -579,7 +585,11 @@ target_include_directories(gui PRIVATE PUBLIC $ $/src/libgui) -target_link_libraries(gui fwbcisco fwbjuniper iptlib fwbpf import Qt5::Core Qt5::Widgets Qt5::Network Qt5::PrintSupport) +IF (UseQt6) + target_link_libraries(gui fwbcisco fwbjuniper iptlib fwbpf import Qt6::Core Qt6::Widgets Qt6::Network Qt6::PrintSupport) +ELSE() + target_link_libraries(gui fwbcisco fwbjuniper iptlib fwbpf import Qt5::Core Qt5::Widgets Qt5::Network Qt5::PrintSupport) +ENDIF() target_compile_options(gui PRIVATE ${CXX_DEFAULT_FLAGS}) diff --git a/src/nxosacl/CMakeLists.txt b/src/nxosacl/CMakeLists.txt index f94a9c624..a57edcdf7 100644 --- a/src/nxosacl/CMakeLists.txt +++ b/src/nxosacl/CMakeLists.txt @@ -3,7 +3,11 @@ set(nxosacl_srcs add_executable(fwb_nxosacl ${nxosacl_srcs}) -target_link_libraries(fwb_nxosacl common fwbcisco compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z Qt5::Core Qt5::Widgets) +IF (UseQt6) + target_link_libraries(fwb_nxosacl common fwbcisco compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z Qt6::Core Qt6::Widgets) +ELSE() + target_link_libraries(fwb_nxosacl common fwbcisco compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z Qt5::Core Qt5::Widgets) +ENDIF() IF (WIN32) target_link_libraries(fwb_nxosacl lzma iconv ws2_32) diff --git a/src/parsers/CMakeLists.txt b/src/parsers/CMakeLists.txt index 209ecd100..411e0a6e3 100644 --- a/src/parsers/CMakeLists.txt +++ b/src/parsers/CMakeLists.txt @@ -13,7 +13,11 @@ add_library(fwbparser STATIC ${parsers_srcs}) target_include_directories(fwbparser PUBLIC $) -target_link_libraries(fwbparser import Qt5::Core Qt5::Widgets) +IF (UseQt6) + target_link_libraries(fwbparser import Qt6::Core Qt6::Widgets) +ELSE() + target_link_libraries(fwbparser import Qt5::Core Qt5::Widgets) +ENDIF() target_compile_options(fwbparser PRIVATE ${CXX_DEFAULT_FLAGS}) diff --git a/src/pf/CMakeLists.txt b/src/pf/CMakeLists.txt index 9e96e49da..934d3ca36 100644 --- a/src/pf/CMakeLists.txt +++ b/src/pf/CMakeLists.txt @@ -3,7 +3,11 @@ set(pf_srcs add_executable(fwb_pf ${pf_srcs}) -target_link_libraries(fwb_pf common fwbpf compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z Qt5::Core Qt5::Widgets) +IF (UseQt6) + target_link_libraries(fwb_pf common fwbpf compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z Qt6::Core Qt6::Widgets) +ELSE() + target_link_libraries(fwb_pf common fwbpf compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z Qt5::Core Qt5::Widgets) +ENDIF() IF (WIN32) target_link_libraries(fwb_pf lzma iconv ws2_32) diff --git a/src/pflib/CMakeLists.txt b/src/pflib/CMakeLists.txt index 6ee3904ce..79e558f50 100644 --- a/src/pflib/CMakeLists.txt +++ b/src/pflib/CMakeLists.txt @@ -39,7 +39,11 @@ add_library(fwbpf STATIC ${pflib_srcs}) target_include_directories(fwbpf PUBLIC $) -target_link_libraries(fwbpf compilerdriver Qt5::Core) +IF (UseQt6) + target_link_libraries(fwbpf compilerdriver Qt6::Core) +ELSE() + target_link_libraries(fwbpf compilerdriver Qt5::Core) +ENDIF() target_compile_options(fwbpf PRIVATE ${CXX_DEFAULT_FLAGS}) diff --git a/src/pix/CMakeLists.txt b/src/pix/CMakeLists.txt index bb3729b17..fc238badc 100644 --- a/src/pix/CMakeLists.txt +++ b/src/pix/CMakeLists.txt @@ -3,7 +3,11 @@ set(pix_srcs add_executable(fwb_pix ${pix_srcs}) -target_link_libraries(fwb_pix common fwbcisco compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z Qt5::Core Qt5::Widgets) +IF (UseQt6) + target_link_libraries(fwb_pix common fwbcisco compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z Qt6::Core Qt6::Widgets) +ELSE() + target_link_libraries(fwb_pix common fwbcisco compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z Qt5::Core Qt5::Widgets) +ENDIF() IF (WIN32) target_link_libraries(fwb_pix lzma iconv ws2_32) diff --git a/src/procurve_acl/CMakeLists.txt b/src/procurve_acl/CMakeLists.txt index 2cbda085c..bea1aec5a 100644 --- a/src/procurve_acl/CMakeLists.txt +++ b/src/procurve_acl/CMakeLists.txt @@ -4,7 +4,11 @@ set(procurve_acl_srcs add_executable(fwb_procurve_acl ${procurve_acl_srcs}) -target_link_libraries(fwb_procurve_acl common fwbcisco compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z Qt5::Core Qt5::Widgets) +IF (UseQt6) + target_link_libraries(fwb_procurve_acl common fwbcisco compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z Qt6::Core Qt6::Widgets) +ELSE() + target_link_libraries(fwb_procurve_acl common fwbcisco compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z Qt5::Core Qt5::Widgets) +ENDIF() IF (WIN32) target_link_libraries(fwb_procurve_acl lzma iconv ws2_32) diff --git a/src/unit_tests/AddressRangeDialogTest/CMakeLists.txt b/src/unit_tests/AddressRangeDialogTest/CMakeLists.txt index 93b4ada1f..896d7bb06 100644 --- a/src/unit_tests/AddressRangeDialogTest/CMakeLists.txt +++ b/src/unit_tests/AddressRangeDialogTest/CMakeLists.txt @@ -3,7 +3,11 @@ SET(CMAKE_AUTOMOC ON) add_executable(AddressRangeDialogTest AddressRangeDialogTest.cpp main_AddressRangeDialogTest.cpp) add_test(NAME AddressRangeDialogTest COMMAND AddressRangeDialogTest) -target_link_libraries(AddressRangeDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(AddressRangeDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(AddressRangeDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(AddressRangeDialogTest PRIVATE netsnmp) diff --git a/src/unit_tests/AddressTableTest/CMakeLists.txt b/src/unit_tests/AddressTableTest/CMakeLists.txt index 9cfb9971a..780a22ec4 100644 --- a/src/unit_tests/AddressTableTest/CMakeLists.txt +++ b/src/unit_tests/AddressTableTest/CMakeLists.txt @@ -3,7 +3,11 @@ SET(CMAKE_AUTOMOC ON) add_executable(AddressTableTest AddressTableTest.cpp main.cpp) add_test(NAME AddressTableTest COMMAND AddressTableTest) -target_link_libraries(AddressTableTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(AddressTableTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(AddressTableTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(AddressTableTest PRIVATE netsnmp) diff --git a/src/unit_tests/CMakeLists.txt b/src/unit_tests/CMakeLists.txt index f17816c01..dfb080b24 100644 --- a/src/unit_tests/CMakeLists.txt +++ b/src/unit_tests/CMakeLists.txt @@ -1,7 +1,11 @@ include( CTest ) if(BUILD_TESTING AND (UNIX AND NOT APPLE)) - find_package(Qt5Test REQUIRED) + IF (UseQt6) + find_package(Qt6 COMPONENTS Test REQUIRED) + ELSE() + find_package(Qt5Test REQUIRED) + ENDIF() add_subdirectory(main) diff --git a/src/unit_tests/CustomServiceDialogTest/CMakeLists.txt b/src/unit_tests/CustomServiceDialogTest/CMakeLists.txt index 71d502f1a..3a18a6edb 100644 --- a/src/unit_tests/CustomServiceDialogTest/CMakeLists.txt +++ b/src/unit_tests/CustomServiceDialogTest/CMakeLists.txt @@ -3,7 +3,11 @@ SET(CMAKE_AUTOMOC ON) add_executable(CustomServiceDialogTest CustomServiceDialogTest.cpp main_CustomServiceDialogTest.cpp) add_test(NAME CustomServiceDialogTest COMMAND CustomServiceDialogTest) -target_link_libraries(CustomServiceDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(CustomServiceDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(CustomServiceDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(CustomServiceDialogTest PRIVATE netsnmp) diff --git a/src/unit_tests/DNSTest/CMakeLists.txt b/src/unit_tests/DNSTest/CMakeLists.txt index a28b645d9..4b50c07df 100644 --- a/src/unit_tests/DNSTest/CMakeLists.txt +++ b/src/unit_tests/DNSTest/CMakeLists.txt @@ -3,7 +3,11 @@ SET(CMAKE_AUTOMOC ON) add_executable(DNSTest DNSTest.cpp main.cpp) add_test(NAME DNSTest COMMAND DNSTest) -target_link_libraries(DNSTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(DNSTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(DNSTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(DNSTest PRIVATE netsnmp) diff --git a/src/unit_tests/FWBTreeTest/CMakeLists.txt b/src/unit_tests/FWBTreeTest/CMakeLists.txt index 3be3197e3..f6b019ae3 100644 --- a/src/unit_tests/FWBTreeTest/CMakeLists.txt +++ b/src/unit_tests/FWBTreeTest/CMakeLists.txt @@ -3,4 +3,8 @@ SET(CMAKE_AUTOMOC ON) add_executable(FWBTreeTest FWBTreeTest.cpp main_FWBTreeTest.cpp) add_test(NAME FWBTreeTest COMMAND FWBTreeTest) -target_link_libraries(FWBTreeTest PRIVATE gui fwbuilder xml2 xslt z Qt5::Test) +IF (UseQt6) + target_link_libraries(FWBTreeTest PRIVATE gui fwbuilder xml2 xslt z Qt6::Test) +ELSE() + target_link_libraries(FWBTreeTest PRIVATE gui fwbuilder xml2 xslt z Qt5::Test) +ENDIF() diff --git a/src/unit_tests/FWObjectTest/CMakeLists.txt b/src/unit_tests/FWObjectTest/CMakeLists.txt index 5089a253b..13b62330c 100644 --- a/src/unit_tests/FWObjectTest/CMakeLists.txt +++ b/src/unit_tests/FWObjectTest/CMakeLists.txt @@ -3,4 +3,8 @@ SET(CMAKE_AUTOMOC ON) add_executable(FWObjectTest FWObjectTest.cpp main.cpp) add_test(NAME FWObjectTest COMMAND FWObjectTest) -target_link_libraries(FWObjectTest PRIVATE fwbuilder xml2 xslt z Qt5::Test) +IF (UseQt6) + target_link_libraries(FWObjectTest PRIVATE fwbuilder xml2 xslt z Qt6::Test) +ELSE() + target_link_libraries(FWObjectTest PRIVATE fwbuilder xml2 xslt z Qt5::Test) +ENDIF() diff --git a/src/unit_tests/FirewallDialogTest/CMakeLists.txt b/src/unit_tests/FirewallDialogTest/CMakeLists.txt index d010bd3ba..13db93f64 100644 --- a/src/unit_tests/FirewallDialogTest/CMakeLists.txt +++ b/src/unit_tests/FirewallDialogTest/CMakeLists.txt @@ -3,7 +3,11 @@ SET(CMAKE_AUTOMOC ON) add_executable(FirewallDialogTest FirewallDialogTest.cpp main_FirewallDialogTest.cpp) add_test(NAME FirewallDialogTest COMMAND FirewallDialogTest) -target_link_libraries(FirewallDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(FirewallDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(FirewallDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(FirewallDialogTest PRIVATE netsnmp) diff --git a/src/unit_tests/GroupObjectDialogTest/CMakeLists.txt b/src/unit_tests/GroupObjectDialogTest/CMakeLists.txt index 32adc5879..850acba08 100644 --- a/src/unit_tests/GroupObjectDialogTest/CMakeLists.txt +++ b/src/unit_tests/GroupObjectDialogTest/CMakeLists.txt @@ -3,7 +3,11 @@ SET(CMAKE_AUTOMOC ON) add_executable(GroupObjectDialogTest GroupObjectDialogTest.cpp main_GroupObjectDialogTest.cpp) add_test(NAME GroupObjectDialogTest COMMAND GroupObjectDialogTest) -target_link_libraries(GroupObjectDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(GroupObjectDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(GroupObjectDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(GroupObjectDialogTest PRIVATE netsnmp) diff --git a/src/unit_tests/ICMP6ServiceDialogTest/CMakeLists.txt b/src/unit_tests/ICMP6ServiceDialogTest/CMakeLists.txt index 0970fa5eb..481b7ee0b 100644 --- a/src/unit_tests/ICMP6ServiceDialogTest/CMakeLists.txt +++ b/src/unit_tests/ICMP6ServiceDialogTest/CMakeLists.txt @@ -3,7 +3,11 @@ SET(CMAKE_AUTOMOC ON) add_executable(ICMP6ServiceDialogTest ICMP6ServiceDialogTest.cpp main_ICMP6ServiceDialogTest.cpp) add_test(NAME ICMP6ServiceDialogTest COMMAND ICMP6ServiceDialogTest) -target_link_libraries(ICMP6ServiceDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(ICMP6ServiceDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(ICMP6ServiceDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(ICMP6ServiceDialogTest PRIVATE netsnmp) diff --git a/src/unit_tests/ICMPServiceDialogTest/CMakeLists.txt b/src/unit_tests/ICMPServiceDialogTest/CMakeLists.txt index be8b96da1..9db1dbf8b 100644 --- a/src/unit_tests/ICMPServiceDialogTest/CMakeLists.txt +++ b/src/unit_tests/ICMPServiceDialogTest/CMakeLists.txt @@ -3,7 +3,11 @@ SET(CMAKE_AUTOMOC ON) add_executable(ICMPServiceDialogTest ICMPServiceDialogTest.cpp main_ICMPServiceDialogTest.cpp) add_test(NAME ICMPServiceDialogTest COMMAND ICMPServiceDialogTest) -target_link_libraries(ICMPServiceDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(ICMPServiceDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(ICMPServiceDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(ICMPServiceDialogTest PRIVATE netsnmp) diff --git a/src/unit_tests/IPDialogTest/CMakeLists.txt b/src/unit_tests/IPDialogTest/CMakeLists.txt index 090ae0329..499e3883e 100644 --- a/src/unit_tests/IPDialogTest/CMakeLists.txt +++ b/src/unit_tests/IPDialogTest/CMakeLists.txt @@ -3,7 +3,11 @@ SET(CMAKE_AUTOMOC ON) add_executable(IPDialogTest IPDialogTest.cpp main_IPDialogTest.cpp) add_test(NAME IPDialogTest COMMAND IPDialogTest) -target_link_libraries(IPDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(IPDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(IPDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(IPDialogTest PRIVATE netsnmp) diff --git a/src/unit_tests/IPServiceDialogTest/CMakeLists.txt b/src/unit_tests/IPServiceDialogTest/CMakeLists.txt index 22cbf099b..817c3891a 100644 --- a/src/unit_tests/IPServiceDialogTest/CMakeLists.txt +++ b/src/unit_tests/IPServiceDialogTest/CMakeLists.txt @@ -3,7 +3,11 @@ SET(CMAKE_AUTOMOC ON) add_executable(IPServiceDialogTest IPServiceDialogTest.cpp main_IPServiceDialogTest.cpp) add_test(NAME IPServiceDialogTest COMMAND IPServiceDialogTest) -target_link_libraries(IPServiceDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(IPServiceDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(IPServiceDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(IPServiceDialogTest PRIVATE netsnmp) diff --git a/src/unit_tests/ImporterTest/CMakeLists.txt b/src/unit_tests/ImporterTest/CMakeLists.txt index 031ba2e80..e5a0abd92 100644 --- a/src/unit_tests/ImporterTest/CMakeLists.txt +++ b/src/unit_tests/ImporterTest/CMakeLists.txt @@ -3,7 +3,11 @@ set (CMAKE_AUTOMOC ON) add_executable(ImporterTest ImporterTest.cpp main_ImporterTest.cpp) add_test(NAME ImporterTest COMMAND ImporterTest) -target_link_libraries(ImporterTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(ImporterTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(ImporterTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(ImporterTest PRIVATE netsnmp) diff --git a/src/unit_tests/Inet6AddrMaskTest/CMakeLists.txt b/src/unit_tests/Inet6AddrMaskTest/CMakeLists.txt index 507e3b9b9..6f862ca7e 100644 --- a/src/unit_tests/Inet6AddrMaskTest/CMakeLists.txt +++ b/src/unit_tests/Inet6AddrMaskTest/CMakeLists.txt @@ -3,4 +3,8 @@ set (CMAKE_AUTOMOC ON) add_executable(Inet6AddrMaskTest Inet6AddrMaskTest.cpp main.cpp) add_test(NAME Inet6AddrMaskTest COMMAND Inet6AddrMaskTest) -target_link_libraries(Inet6AddrMaskTest PRIVATE fwbuilder xml2 xslt z Qt5::Test) +IF (UseQt6) + target_link_libraries(Inet6AddrMaskTest PRIVATE fwbuilder xml2 xslt z Qt6::Test) +ELSE() + target_link_libraries(Inet6AddrMaskTest PRIVATE fwbuilder xml2 xslt z Qt5::Test) +ENDIF() diff --git a/src/unit_tests/InetAddrMaskTest/CMakeLists.txt b/src/unit_tests/InetAddrMaskTest/CMakeLists.txt index c765420a6..9293ce4a3 100644 --- a/src/unit_tests/InetAddrMaskTest/CMakeLists.txt +++ b/src/unit_tests/InetAddrMaskTest/CMakeLists.txt @@ -3,4 +3,8 @@ set (CMAKE_AUTOMOC ON) add_executable(InetAddrMaskTest InetAddrMaskTest.cpp main.cpp) add_test(NAME InetAddrMaskTest COMMAND InetAddrMaskTest) -target_link_libraries(InetAddrMaskTest PRIVATE fwbuilder xml2 xslt z Qt5::Test) +IF (UseQt6) + target_link_libraries(InetAddrMaskTest PRIVATE fwbuilder xml2 xslt z Qt6::Test) +ELSE() + target_link_libraries(InetAddrMaskTest PRIVATE fwbuilder xml2 xslt z Qt5::Test) +ENDIF() diff --git a/src/unit_tests/InterfaceDialogTest/CMakeLists.txt b/src/unit_tests/InterfaceDialogTest/CMakeLists.txt index 050e80653..9fd6c0cd5 100644 --- a/src/unit_tests/InterfaceDialogTest/CMakeLists.txt +++ b/src/unit_tests/InterfaceDialogTest/CMakeLists.txt @@ -3,7 +3,11 @@ SET(CMAKE_AUTOMOC ON) add_executable(InterfaceDialogTest InterfaceDialogTest.cpp main_InterfaceDialogTest.cpp) add_test(NAME InterfaceDialogTest COMMAND InterfaceDialogTest) -target_link_libraries(InterfaceDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(InterfaceDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(InterfaceDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(InterfaceDialogTest PRIVATE netsnmp) diff --git a/src/unit_tests/NetworkDialogTest/CMakeLists.txt b/src/unit_tests/NetworkDialogTest/CMakeLists.txt index 60b032433..a2c984e60 100644 --- a/src/unit_tests/NetworkDialogTest/CMakeLists.txt +++ b/src/unit_tests/NetworkDialogTest/CMakeLists.txt @@ -3,7 +3,11 @@ SET(CMAKE_AUTOMOC ON) add_executable(NetworkDialogTest NetworkDialogTest.cpp main_NetworkDialogTest.cpp) add_test(NAME NetworkDialogTest COMMAND NetworkDialogTest) -target_link_libraries(NetworkDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(NetworkDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(NetworkDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(NetworkDialogTest PRIVATE netsnmp) diff --git a/src/unit_tests/ObjectManipulatorTest/CMakeLists.txt b/src/unit_tests/ObjectManipulatorTest/CMakeLists.txt index 5b68588fc..5034235d5 100644 --- a/src/unit_tests/ObjectManipulatorTest/CMakeLists.txt +++ b/src/unit_tests/ObjectManipulatorTest/CMakeLists.txt @@ -3,7 +3,11 @@ SET(CMAKE_AUTOMOC ON) add_executable(ObjectManipulatorTest ObjectManipulatorTest.cpp main_ObjectManipulatorTest.cpp) add_test(NAME ObjectManipulatorTest COMMAND ObjectManipulatorTest) -target_link_libraries(ObjectManipulatorTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(ObjectManipulatorTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(ObjectManipulatorTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(ObjectManipulatorTest PRIVATE netsnmp) diff --git a/src/unit_tests/ObjectMatcherTest/CMakeLists.txt b/src/unit_tests/ObjectMatcherTest/CMakeLists.txt index 844d46674..17917117e 100644 --- a/src/unit_tests/ObjectMatcherTest/CMakeLists.txt +++ b/src/unit_tests/ObjectMatcherTest/CMakeLists.txt @@ -3,7 +3,11 @@ set (CMAKE_AUTOMOC ON) add_executable(ObjectMatcherTest ObjectMatcherTest.cpp main.cpp) add_test(NAME ObjectMatcherTest COMMAND ObjectMatcherTest) -target_link_libraries(ObjectMatcherTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(ObjectMatcherTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(ObjectMatcherTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(ObjectMatcherTest PRIVATE netsnmp) diff --git a/src/unit_tests/PFImporterTest/CMakeLists.txt b/src/unit_tests/PFImporterTest/CMakeLists.txt index 97a081ece..cfeef93e9 100644 --- a/src/unit_tests/PFImporterTest/CMakeLists.txt +++ b/src/unit_tests/PFImporterTest/CMakeLists.txt @@ -3,7 +3,11 @@ set (CMAKE_AUTOMOC ON) add_executable(PFImporterTest PFImporterTest.cpp main_PFImporterTest.cpp) add_test(NAME PFImporterTest COMMAND PFImporterTest) -target_link_libraries(PFImporterTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(PFImporterTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(PFImporterTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(PFImporterTest PRIVATE netsnmp) diff --git a/src/unit_tests/PIXImporterTest/CMakeLists.txt b/src/unit_tests/PIXImporterTest/CMakeLists.txt index 383f1cced..873fa8af5 100644 --- a/src/unit_tests/PIXImporterTest/CMakeLists.txt +++ b/src/unit_tests/PIXImporterTest/CMakeLists.txt @@ -3,7 +3,11 @@ set (CMAKE_AUTOMOC ON) add_executable(PIXImporterTest PIXImporterTest.cpp main_PIXImporterTest.cpp) add_test(NAME PIXImporterTest COMMAND PIXImporterTest) -target_link_libraries(PIXImporterTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(PIXImporterTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(PIXImporterTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(PIXImporterTest PRIVATE netsnmp) diff --git a/src/unit_tests/RCS/CMakeLists.txt b/src/unit_tests/RCS/CMakeLists.txt index fff5161cb..075625e25 100644 --- a/src/unit_tests/RCS/CMakeLists.txt +++ b/src/unit_tests/RCS/CMakeLists.txt @@ -3,7 +3,11 @@ set (CMAKE_AUTOMOC ON) add_executable(RCSTest RCSTest.cpp main_RCS.cpp) add_test(NAME RCSTest COMMAND RCSTest) -target_link_libraries(RCSTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(RCSTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(RCSTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(RCSTest PRIVATE netsnmp) diff --git a/src/unit_tests/RuleSetViewContextMenuTest/CMakeLists.txt b/src/unit_tests/RuleSetViewContextMenuTest/CMakeLists.txt index a8b6bf349..584855313 100644 --- a/src/unit_tests/RuleSetViewContextMenuTest/CMakeLists.txt +++ b/src/unit_tests/RuleSetViewContextMenuTest/CMakeLists.txt @@ -3,7 +3,11 @@ SET(CMAKE_AUTOMOC ON) add_executable(RuleSetViewContextMenuTest RuleSetViewContextMenuTest.cpp main_RuleSetViewContextMenuTest.cpp) add_test(NAME RuleSetViewContextMenuTest COMMAND RuleSetViewContextMenuTest) -target_link_libraries(RuleSetViewContextMenuTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(RuleSetViewContextMenuTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(RuleSetViewContextMenuTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(RuleSetViewContextMenuTest PRIVATE netsnmp) diff --git a/src/unit_tests/RuleSetViewTest/CMakeLists.txt b/src/unit_tests/RuleSetViewTest/CMakeLists.txt index 10e65bf01..fa6276aec 100644 --- a/src/unit_tests/RuleSetViewTest/CMakeLists.txt +++ b/src/unit_tests/RuleSetViewTest/CMakeLists.txt @@ -3,7 +3,11 @@ SET(CMAKE_AUTOMOC ON) add_executable(RuleSetViewTest RuleSetViewTest.cpp main_RuleSetViewTest.cpp) add_test(NAME RuleSetViewTest COMMAND RuleSetViewTest) -target_link_libraries(RuleSetViewTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(RuleSetViewTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(RuleSetViewTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(RuleSetViewTest PRIVATE netsnmp) diff --git a/src/unit_tests/TCPServiceDialogTest/CMakeLists.txt b/src/unit_tests/TCPServiceDialogTest/CMakeLists.txt index c343cdd31..13fc39b0a 100644 --- a/src/unit_tests/TCPServiceDialogTest/CMakeLists.txt +++ b/src/unit_tests/TCPServiceDialogTest/CMakeLists.txt @@ -3,7 +3,11 @@ SET(CMAKE_AUTOMOC ON) add_executable(TCPServiceDialogTest TCPServiceDialogTest.cpp main_TCPServiceDialogTest.cpp) add_test(NAME TCPServiceDialogTest COMMAND TCPServiceDialogTest) -target_link_libraries(TCPServiceDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(TCPServiceDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(TCPServiceDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(TCPServiceDialogTest PRIVATE netsnmp) diff --git a/src/unit_tests/TagServiceDialogTest/CMakeLists.txt b/src/unit_tests/TagServiceDialogTest/CMakeLists.txt index 9ac459a26..5b135bb43 100644 --- a/src/unit_tests/TagServiceDialogTest/CMakeLists.txt +++ b/src/unit_tests/TagServiceDialogTest/CMakeLists.txt @@ -3,7 +3,11 @@ SET(CMAKE_AUTOMOC ON) add_executable(TagServiceDialogTest TagServiceDialogTest.cpp main_TagServiceDialogTest.cpp) add_test(NAME TagServiceDialogTest COMMAND TagServiceDialogTest) -target_link_libraries(TagServiceDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(TagServiceDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(TagServiceDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(TagServiceDialogTest PRIVATE netsnmp) diff --git a/src/unit_tests/UDPServiceDialogTest/CMakeLists.txt b/src/unit_tests/UDPServiceDialogTest/CMakeLists.txt index e59cd070d..d0cd2c6f1 100644 --- a/src/unit_tests/UDPServiceDialogTest/CMakeLists.txt +++ b/src/unit_tests/UDPServiceDialogTest/CMakeLists.txt @@ -3,7 +3,11 @@ SET(CMAKE_AUTOMOC ON) add_executable(UDPServiceDialogTest UDPServiceDialogTest.cpp main_UDPServiceDialogTest.cpp) add_test(NAME UDPServiceDialogTest COMMAND UDPServiceDialogTest) -target_link_libraries(UDPServiceDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(UDPServiceDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(UDPServiceDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(UDPServiceDialogTest PRIVATE netsnmp) diff --git a/src/unit_tests/UsageResolverTest/CMakeLists.txt b/src/unit_tests/UsageResolverTest/CMakeLists.txt index 52e2063bd..841832ec0 100644 --- a/src/unit_tests/UsageResolverTest/CMakeLists.txt +++ b/src/unit_tests/UsageResolverTest/CMakeLists.txt @@ -3,7 +3,11 @@ set (CMAKE_AUTOMOC ON) add_executable(UsageResolverTest UsageResolverTest.cpp main_UsageResolverTest.cpp) add_test(NAME UsageResolverTest COMMAND UsageResolverTest) -target_link_libraries(UsageResolverTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(UsageResolverTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(UsageResolverTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(UsageResolverTest PRIVATE netsnmp) diff --git a/src/unit_tests/UserSerivceDialogTest/CMakeLists.txt b/src/unit_tests/UserSerivceDialogTest/CMakeLists.txt index 7d6ee0235..4c1903fd7 100644 --- a/src/unit_tests/UserSerivceDialogTest/CMakeLists.txt +++ b/src/unit_tests/UserSerivceDialogTest/CMakeLists.txt @@ -3,7 +3,11 @@ SET(CMAKE_AUTOMOC ON) add_executable(UserServiceDialogTest UserServiceDialogTest.cpp main_UserServiceDialogTest.cpp) add_test(NAME UserServiceDialogTest COMMAND UserServiceDialogTest) -target_link_libraries(UserServiceDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(UserServiceDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(UserServiceDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(UserServiceDialogTest PRIVATE PRIVATE netsnmp) diff --git a/src/unit_tests/compilerLibTest/CMakeLists.txt b/src/unit_tests/compilerLibTest/CMakeLists.txt index f971fe9f7..40a291aba 100644 --- a/src/unit_tests/compilerLibTest/CMakeLists.txt +++ b/src/unit_tests/compilerLibTest/CMakeLists.txt @@ -5,7 +5,11 @@ add_definitions(-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\") add_executable(compilerLibTest interfacePropertiesTest.cpp tests_main.cpp) add_test(NAME compilerLibTest COMMAND compilerLibTest) -target_link_libraries(compilerLibTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(compilerLibTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(compilerLibTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(compilerLibTest PRIVATE netsnmp) diff --git a/src/unit_tests/generatedScriptTestsIpfilter/CMakeLists.txt b/src/unit_tests/generatedScriptTestsIpfilter/CMakeLists.txt index 76945c0e4..ea23f1f97 100644 --- a/src/unit_tests/generatedScriptTestsIpfilter/CMakeLists.txt +++ b/src/unit_tests/generatedScriptTestsIpfilter/CMakeLists.txt @@ -3,7 +3,11 @@ SET(CMAKE_AUTOMOC ON) add_executable(generatedScriptTestsIpfilter generatedScriptTestsIpfilter.cpp main_generatedScriptTestsIpfilter.cpp) add_test(NAME generatedScriptTestsIpfilter COMMAND generatedScriptTestsIpfilter) -target_link_libraries(generatedScriptTestsIpfilter PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(generatedScriptTestsIpfilter PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(generatedScriptTestsIpfilter PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(generatedScriptTestsIpfilter PRIVATE netsnmp) diff --git a/src/unit_tests/generatedScriptTestsIpfw/CMakeLists.txt b/src/unit_tests/generatedScriptTestsIpfw/CMakeLists.txt index 30bc03061..6866b794d 100644 --- a/src/unit_tests/generatedScriptTestsIpfw/CMakeLists.txt +++ b/src/unit_tests/generatedScriptTestsIpfw/CMakeLists.txt @@ -3,7 +3,11 @@ SET(CMAKE_AUTOMOC ON) add_executable(generatedScriptTestsIpfw generatedScriptTestsIpfw.cpp main_generatedScriptTestsIpfw.cpp) add_test(NAME generatedScriptTestsIpfw COMMAND generatedScriptTestsIpfw) -target_link_libraries(generatedScriptTestsIpfw PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(generatedScriptTestsIpfw PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(generatedScriptTestsIpfw PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(generatedScriptTestsIpfw PRIVATE netsnmp) diff --git a/src/unit_tests/generatedScriptTestsLinux/CMakeLists.txt b/src/unit_tests/generatedScriptTestsLinux/CMakeLists.txt index 598ce7746..12ad23053 100644 --- a/src/unit_tests/generatedScriptTestsLinux/CMakeLists.txt +++ b/src/unit_tests/generatedScriptTestsLinux/CMakeLists.txt @@ -3,7 +3,11 @@ SET(CMAKE_AUTOMOC ON) add_executable(generatedScriptTestsLinux generatedScriptTestsLinux.cpp main_generatedScriptTestsLinux.cpp) add_test(NAME generatedScriptTestsLinux COMMAND generatedScriptTestsLinux) -target_link_libraries(generatedScriptTestsLinux PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(generatedScriptTestsLinux PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(generatedScriptTestsLinux PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(generatedScriptTestsLinux PRIVATE netsnmp) diff --git a/src/unit_tests/generatedScriptTestsPF/CMakeLists.txt b/src/unit_tests/generatedScriptTestsPF/CMakeLists.txt index a89dfc98e..637460af6 100644 --- a/src/unit_tests/generatedScriptTestsPF/CMakeLists.txt +++ b/src/unit_tests/generatedScriptTestsPF/CMakeLists.txt @@ -3,7 +3,11 @@ SET(CMAKE_AUTOMOC ON) add_executable(generatedScriptTestsPF generatedScriptTestsPF.cpp main_generatedScriptTestsPF.cpp) add_test(NAME generatedScriptTestsPF COMMAND generatedScriptTestsPF) -target_link_libraries(generatedScriptTestsPF PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(generatedScriptTestsPF PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(generatedScriptTestsPF PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(generatedScriptTestsPF PRIVATE netsnmp) diff --git a/src/unit_tests/generatedScriptTestsSecuwall/CMakeLists.txt b/src/unit_tests/generatedScriptTestsSecuwall/CMakeLists.txt index 842db026e..978a18483 100644 --- a/src/unit_tests/generatedScriptTestsSecuwall/CMakeLists.txt +++ b/src/unit_tests/generatedScriptTestsSecuwall/CMakeLists.txt @@ -3,7 +3,11 @@ SET(CMAKE_AUTOMOC ON) add_executable(generatedScriptTestsSecuwall generatedScriptTestsSecuwall.cpp main_generatedScriptTestsSecuwall.cpp) add_test(NAME generatedScriptTestsSecuwall COMMAND generatedScriptTestsSecuwall) -target_link_libraries(generatedScriptTestsSecuwall PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(generatedScriptTestsSecuwall PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(generatedScriptTestsSecuwall PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(generatedScriptTestsSecuwall PRIVATE netsnmp) diff --git a/src/unit_tests/genericDialogTest/CMakeLists.txt b/src/unit_tests/genericDialogTest/CMakeLists.txt index 112437ac3..dbd7992f5 100644 --- a/src/unit_tests/genericDialogTest/CMakeLists.txt +++ b/src/unit_tests/genericDialogTest/CMakeLists.txt @@ -3,7 +3,11 @@ SET(CMAKE_AUTOMOC ON) add_executable(genericDialogTest genericDialogTest.cpp main_genericDialogTest.cpp) add_test(NAME genericDialogTest COMMAND genericDialogTest) -target_link_libraries(genericDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(genericDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(genericDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(genericDialogTest PRIVATE netsnmp) diff --git a/src/unit_tests/instDialogClusterTest/CMakeLists.txt b/src/unit_tests/instDialogClusterTest/CMakeLists.txt index 98f889c99..3d23ba8a0 100644 --- a/src/unit_tests/instDialogClusterTest/CMakeLists.txt +++ b/src/unit_tests/instDialogClusterTest/CMakeLists.txt @@ -3,7 +3,11 @@ SET(CMAKE_AUTOMOC ON) add_executable(instDialogClusterTest instDialogClusterTest.cpp main_instDialogClusterTest.cpp) add_test(NAME instDialogClusterTest COMMAND instDialogClusterTest) -target_link_libraries(instDialogClusterTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(instDialogClusterTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(instDialogClusterTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(instDialogClusterTest PRIVATE netsnmp) diff --git a/src/unit_tests/instDialogCompileTest/CMakeLists.txt b/src/unit_tests/instDialogCompileTest/CMakeLists.txt index 3f68ebebf..87165eaaa 100644 --- a/src/unit_tests/instDialogCompileTest/CMakeLists.txt +++ b/src/unit_tests/instDialogCompileTest/CMakeLists.txt @@ -3,7 +3,11 @@ SET(CMAKE_AUTOMOC ON) add_executable(instDialogCompileTest instDialogCompileTest.cpp main_instDialogCompileTest.cpp) add_test(NAME instDialogCompileTest COMMAND instDialogCompileTest) -target_link_libraries(instDialogCompileTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(instDialogCompileTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(instDialogCompileTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(instDialogCompileTest PRIVATE netsnmp) diff --git a/src/unit_tests/instDialogInspectTest/CMakeLists.txt b/src/unit_tests/instDialogInspectTest/CMakeLists.txt index ac478e046..92ce0cdf3 100644 --- a/src/unit_tests/instDialogInspectTest/CMakeLists.txt +++ b/src/unit_tests/instDialogInspectTest/CMakeLists.txt @@ -3,7 +3,11 @@ SET(CMAKE_AUTOMOC ON) add_executable(instDialogInspectTest instDialogInspectTest.cpp main_instDialogInspectTest.cpp) add_test(NAME instDialogInspectTest COMMAND instDialogInspectTest) -target_link_libraries(instDialogInspectTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(instDialogInspectTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(instDialogInspectTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(instDialogInspectTest PRIVATE netsnmp) diff --git a/src/unit_tests/instDialogInstallTest/CMakeLists.txt b/src/unit_tests/instDialogInstallTest/CMakeLists.txt index 19e7c71d8..fe340e8c9 100644 --- a/src/unit_tests/instDialogInstallTest/CMakeLists.txt +++ b/src/unit_tests/instDialogInstallTest/CMakeLists.txt @@ -3,7 +3,11 @@ SET(CMAKE_AUTOMOC ON) add_executable(instDialogInstallTest instDialogInstallTest.cpp main_instDialogInstallTest.cpp) add_test(NAME instDialogInstallTest COMMAND instDialogInstallTest) -target_link_libraries(instDialogInstallTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(instDialogInstallTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(instDialogInstallTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(instDialogInstallTest PRIVATE netsnmp) diff --git a/src/unit_tests/instDialogObjectListTest/CMakeLists.txt b/src/unit_tests/instDialogObjectListTest/CMakeLists.txt index 0b9cc52b2..a08e35421 100644 --- a/src/unit_tests/instDialogObjectListTest/CMakeLists.txt +++ b/src/unit_tests/instDialogObjectListTest/CMakeLists.txt @@ -3,7 +3,11 @@ SET(CMAKE_AUTOMOC ON) add_executable(instDialogObjectListTest instDialogObjectListTest.cpp main_instDialogObjectListTest.cpp) add_test(NAME instDialogObjectListTest COMMAND instDialogObjectListTest) -target_link_libraries(instDialogObjectListTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(instDialogObjectListTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(instDialogObjectListTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(instDialogObjectListTest PRIVATE netsnmp) diff --git a/src/unit_tests/main/CMakeLists.txt b/src/unit_tests/main/CMakeLists.txt index 4f70a1c3b..78833411c 100644 --- a/src/unit_tests/main/CMakeLists.txt +++ b/src/unit_tests/main/CMakeLists.txt @@ -1,4 +1,8 @@ add_library(test_main STATIC main.cpp) -target_link_libraries(test_main gui Qt5::Test) +IF (UseQt6) + target_link_libraries(test_main gui Qt6::Test) +ELSE() + target_link_libraries(test_main gui Qt5::Test) +ENDIF() diff --git a/src/unit_tests/newClusterDialogTest/CMakeLists.txt b/src/unit_tests/newClusterDialogTest/CMakeLists.txt index 492f8361f..e10f23caa 100644 --- a/src/unit_tests/newClusterDialogTest/CMakeLists.txt +++ b/src/unit_tests/newClusterDialogTest/CMakeLists.txt @@ -3,7 +3,11 @@ SET(CMAKE_AUTOMOC ON) add_executable(newClusterDialogTest newClusterDialogTest.cpp main_newClusterDialogTest.cpp) add_test(NAME newClusterDialogTest COMMAND newClusterDialogTest) -target_link_libraries(newClusterDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(newClusterDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(newClusterDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(newClusterDialogTest PRIVATE netsnmp) diff --git a/src/unit_tests/parseCommandLineTest/CMakeLists.txt b/src/unit_tests/parseCommandLineTest/CMakeLists.txt index 8ae0ea60a..7c875d558 100644 --- a/src/unit_tests/parseCommandLineTest/CMakeLists.txt +++ b/src/unit_tests/parseCommandLineTest/CMakeLists.txt @@ -3,7 +3,11 @@ set (CMAKE_AUTOMOC ON) add_executable(parseCommandLineTest parseCommandLineTest.cpp main_parseCommandLineTest.cpp) add_test(NAME parseCommandLineTest COMMAND parseCommandLineTest) -target_link_libraries(parseCommandLineTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(parseCommandLineTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(parseCommandLineTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(parseCommandLineTest PRIVATE netsnmp) diff --git a/src/unit_tests/startTipDialogTest/CMakeLists.txt b/src/unit_tests/startTipDialogTest/CMakeLists.txt index a2b7b7071..21d193286 100644 --- a/src/unit_tests/startTipDialogTest/CMakeLists.txt +++ b/src/unit_tests/startTipDialogTest/CMakeLists.txt @@ -3,7 +3,11 @@ SET(CMAKE_AUTOMOC ON) add_executable(startTipDialogTest startTipDialogTest.cpp main_startTipDialogTest.cpp) add_test(NAME startTipDialogTest COMMAND startTipDialogTest) -target_link_libraries(startTipDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +IF (UseQt6) + target_link_libraries(startTipDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt6::Test) +ELSE() + target_link_libraries(startTipDialogTest PRIVATE test_main gui import fwbparser antlr common iptlib fwbpf fwbjuniper fwbcisco compilerdriver fwcompiler fwbuilder xml2 xslt z pthread Qt5::Test) +ENDIF() IF (NETSNMP_FOUND) target_link_libraries(startTipDialogTest PRIVATE netsnmp)