onkelbeh
/
fwbuilder
mirror of https://github.com/fwbuilder/fwbuilder
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: Deprecated Qt cmake macro

This commit is contained in:
Sirius Bakke 2020-10-07 21:06:23 +02:00
parent 0b9307bb5e
commit c86153e0e7
21 changed files with 23 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cisco_lib/CMakeLists.txt
View File

@ -69,9 +69,7 @@ target_include_directories(fwbcisco PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/..)
target_link_libraries(fwbcisco compilerdriver)
target_link_libraries(fwbcisco compilerdriver Qt5::Core)
target_compile_options(fwbcisco PRIVATE ${CXX_DEFAULT_FLAGS})
qt5_use_modules(fwbcisco Core)

4
src/common/CMakeLists.txt
View File

@ -7,11 +7,9 @@ add_library(common STATIC ${common_srcs})
target_include_directories(common PRIVATE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
target_link_libraries(common fwbuilder)
target_link_libraries(common fwbuilder Qt5::Core)
target_compile_options(common PRIVATE ${CXX_DEFAULT_FLAGS})
set_source_files_properties(init.cpp PROPERTIES COMPILE_DEFINITIONS PREFIX=\"${CMAKE_INSTALL_PREFIX}\")
qt5_use_modules(common Core)

4
src/compiler_lib/CMakeLists.txt
View File

@ -21,9 +21,7 @@ add_library(compilerdriver STATIC ${compiler_lib_srcs})
target_include_directories(compilerdriver PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
target_link_libraries(compilerdriver fwbuilder)
target_link_libraries(compilerdriver fwbuilder Qt5::Core)
target_compile_options(compilerdriver PRIVATE ${CXX_DEFAULT_FLAGS})
qt5_use_modules(compilerdriver Core)

4
src/fwbedit/CMakeLists.txt
View File

@ -12,7 +12,7 @@ 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)
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 (WIN32)
target_link_libraries(fwbedit lzma iconv)
@ -32,5 +32,3 @@ set_source_files_properties(fwbedit.cpp PROPERTIES COMPILE_DEFINITIONS PREFIX=\"
install(TARGETS fwbedit RUNTIME DESTINATION ${FWB_INSTALL_BINDIR})
qt5_use_modules(fwbedit Widgets PrintSupport)

4
src/gui/CMakeLists.txt
View File

@ -13,7 +13,7 @@ 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)
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 (WIN32)
target_link_libraries(fwbuilder-gui lzma iconv)
@ -37,5 +37,3 @@ else()
install(TARGETS fwbuilder-gui DESTINATION ${FWB_INSTALL_BINDIR} COMPONENT Runtime)
endif()
qt5_use_modules(fwbuilder-gui Widgets Network PrintSupport)

4
src/import/CMakeLists.txt
View File

@ -23,9 +23,7 @@ add_library(import STATIC ${import_srcs})
target_include_directories(import PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
target_link_libraries(import compilerdriver antlr)
target_link_libraries(import compilerdriver antlr Qt5::Core Qt5::Widgets)
target_compile_options(import PRIVATE ${CXX_DEFAULT_FLAGS})
qt5_use_modules(import Widgets)

7
src/iosacl/CMakeLists.txt
View File

@ -1,10 +1,9 @@
set(iosacl_srcs
iosacl.cpp
)
iosacl.cpp)
add_executable(fwb_iosacl ${iosacl_srcs})
target_link_libraries(fwb_iosacl common fwbcisco compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z)
target_link_libraries(fwb_iosacl common fwbcisco compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z Qt5::Core Qt5::Widgets)
IF (WIN32)
target_link_libraries(fwb_iosacl lzma iconv ws2_32)
@ -20,5 +19,3 @@ set_source_files_properties(iosacl.cpp PROPERTIES COMPILE_DEFINITIONS PREFIX=\"$
install(TARGETS fwb_iosacl RUNTIME DESTINATION ${FWB_INSTALL_BINDIR})
qt5_use_modules(fwb_iosacl Widgets)

4
src/ipf/CMakeLists.txt
View File

@ -3,7 +3,7 @@ set(ipf_srcs
add_executable(fwb_ipf ${ipf_srcs})
target_link_libraries(fwb_ipf common fwbpf compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z)
target_link_libraries(fwb_ipf common fwbpf compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z Qt5::Core Qt5::Widgets)
IF (WIN32)
target_link_libraries(fwb_ipf lzma iconv ws2_32)
@ -19,5 +19,3 @@ set_source_files_properties(ipf.cpp PROPERTIES COMPILE_DEFINITIONS PREFIX=\"${CM
install(TARGETS fwb_ipf RUNTIME DESTINATION ${FWB_INSTALL_BINDIR})
qt5_use_modules(fwb_ipf Widgets)

4
src/ipfw/CMakeLists.txt
View File

@ -3,7 +3,7 @@ set(ipfw_srcs
add_executable(fwb_ipfw ${ipfw_srcs})
target_link_libraries(fwb_ipfw common fwbpf compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z)
target_link_libraries(fwb_ipfw common fwbpf compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z Qt5::Core Qt5::Widgets)
IF (WIN32)
target_link_libraries(fwb_ipfw lzma iconv ws2_32)
@ -19,5 +19,3 @@ set_source_files_properties(ipfw.cpp PROPERTIES COMPILE_DEFINITIONS PREFIX=\"${C
install(TARGETS fwb_ipfw RUNTIME DESTINATION ${FWB_INSTALL_BINDIR})
qt5_use_modules(fwb_ipfw Widgets)

4
src/ipt/CMakeLists.txt
View File

@ -3,7 +3,7 @@ set(ipt_srcs
add_executable(fwb_ipt ${ipt_srcs})
target_link_libraries(fwb_ipt common iptlib compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z)
target_link_libraries(fwb_ipt common iptlib compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z Qt5::Core Qt5::Widgets)
IF (WIN32)
target_link_libraries(fwb_ipt lzma iconv)
@ -19,5 +19,3 @@ set_source_files_properties(ipt.cpp PROPERTIES COMPILE_DEFINITIONS PREFIX=\"${CM
install(TARGETS fwb_ipt RUNTIME DESTINATION ${FWB_INSTALL_BINDIR})
qt5_use_modules(fwb_ipt Widgets)

4
src/iptlib/CMakeLists.txt
View File

@ -31,7 +31,7 @@ add_library(iptlib STATIC ${iptlib_srcs})
target_include_directories(iptlib PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
target_link_libraries(iptlib compilerdriver)
target_link_libraries(iptlib compilerdriver Qt5::Core)
IF (WIN32)
target_link_libraries(iptlib compilerdriver ws2_32)
@ -39,5 +39,3 @@ ENDIF()
target_compile_options(iptlib PRIVATE ${CXX_DEFAULT_FLAGS})
qt5_use_modules(iptlib Core)

4
src/juniper_lib/CMakeLists.txt
View File

@ -22,9 +22,7 @@ add_library(fwbjuniper STATIC ${juniper_lib_srcs})
target_include_directories(fwbjuniper PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
target_link_libraries(fwbjuniper fwbcisco compilerdriver)
target_link_libraries(fwbjuniper fwbcisco compilerdriver Qt5::Core)
target_compile_options(fwbjuniper PRIVATE ${CXX_DEFAULT_FLAGS})
qt5_use_modules(fwbjuniper Core)

4
src/junosacl/CMakeLists.txt
View File

@ -4,7 +4,7 @@ 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)
target_link_libraries(fwb_junosacl common fwbcisco fwbjuniper compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z Qt5::Core Qt5::Widgets)
IF (WIN32)
target_link_libraries(fwb_junosacl iconv lzma ws2_32)
@ -20,5 +20,3 @@ set_source_files_properties(junosacl.cpp PROPERTIES COMPILE_DEFINITIONS PREFIX=\
install(TARGETS fwb_junosacl RUNTIME DESTINATION ${FWB_INSTALL_BINDIR})
qt5_use_modules(fwb_junosacl Widgets)

3
src/libgui/CMakeLists.txt
View File

@ -579,8 +579,7 @@ target_include_directories(gui PRIVATE
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>/src/libgui)
target_link_libraries(gui fwbcisco fwbjuniper iptlib fwbpf import)
target_link_libraries(gui fwbcisco fwbjuniper iptlib fwbpf import Qt5::Core Qt5::Widgets Qt5::Network Qt5::PrintSupport)
target_compile_options(gui PRIVATE ${CXX_DEFAULT_FLAGS})
qt5_use_modules(gui Widgets Network PrintSupport)

7
src/nxosacl/CMakeLists.txt
View File

@ -1,10 +1,9 @@
set(nxosacl_srcs
nxosacl.cpp
)
nxosacl.cpp)
add_executable(fwb_nxosacl ${nxosacl_srcs})
target_link_libraries(fwb_nxosacl common fwbcisco compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z)
target_link_libraries(fwb_nxosacl common fwbcisco compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z Qt5::Core Qt5::Widgets)
IF (WIN32)
target_link_libraries(fwb_nxosacl lzma iconv ws2_32)
@ -20,5 +19,3 @@ set_source_files_properties(nxosacl.cpp PROPERTIES COMPILE_DEFINITIONS PREFIX=\"
install(TARGETS fwb_nxosacl RUNTIME DESTINATION ${FWB_INSTALL_BINDIR})
qt5_use_modules(fwb_nxosacl Widgets)

4
src/parsers/CMakeLists.txt
View File

@ -13,9 +13,7 @@ add_library(fwbparser STATIC ${parsers_srcs})
target_include_directories(fwbparser PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
target_link_libraries(fwbparser import)
target_link_libraries(fwbparser import Qt5::Core Qt5::Widgets)
target_compile_options(fwbparser PRIVATE ${CXX_DEFAULT_FLAGS})
qt5_use_modules(fwbparser Widgets)

4
src/pf/CMakeLists.txt
View File

@ -3,7 +3,7 @@ set(pf_srcs
add_executable(fwb_pf ${pf_srcs})
target_link_libraries(fwb_pf common fwbpf compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z)
target_link_libraries(fwb_pf common fwbpf compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z Qt5::Core Qt5::Widgets)
IF (WIN32)
target_link_libraries(fwb_pf lzma iconv ws2_32)
@ -19,5 +19,3 @@ set_source_files_properties(pf.cpp PROPERTIES COMPILE_DEFINITIONS PREFIX=\"${CMA
install(TARGETS fwb_pf RUNTIME DESTINATION ${FWB_INSTALL_BINDIR})
qt5_use_modules(fwb_pf Widgets)

4
src/pflib/CMakeLists.txt
View File

@ -39,9 +39,7 @@ add_library(fwbpf STATIC ${pflib_srcs})
target_include_directories(fwbpf PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
target_link_libraries(fwbpf compilerdriver)
target_link_libraries(fwbpf compilerdriver Qt5::Core)
target_compile_options(fwbpf PRIVATE ${CXX_DEFAULT_FLAGS})
qt5_use_modules(fwbpf Core)

4
src/pix/CMakeLists.txt
View File

@ -3,7 +3,7 @@ set(pix_srcs
add_executable(fwb_pix ${pix_srcs})
target_link_libraries(fwb_pix common fwbcisco compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z)
target_link_libraries(fwb_pix common fwbcisco compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z Qt5::Core Qt5::Widgets)
IF (WIN32)
target_link_libraries(fwb_pix lzma iconv ws2_32)
@ -19,5 +19,3 @@ set_source_files_properties(pix.cpp PROPERTIES COMPILE_DEFINITIONS PREFIX=\"${CM
install(TARGETS fwb_pix RUNTIME DESTINATION ${FWB_INSTALL_BINDIR})
qt5_use_modules(fwb_pix Widgets)

4
src/procurve_acl/CMakeLists.txt
View File

@ -4,7 +4,7 @@ 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)
target_link_libraries(fwb_procurve_acl common fwbcisco compilerdriver fwcompiler fwbuilder xml2 pthread m xslt z Qt5::Core Qt5::Widgets)
IF (WIN32)
target_link_libraries(fwb_procurve_acl lzma iconv ws2_32)
@ -20,5 +20,3 @@ set_source_files_properties(procurve_acl.cpp PROPERTIES COMPILE_DEFINITIONS PREF
install(TARGETS fwb_procurve_acl RUNTIME DESTINATION ${FWB_INSTALL_BINDIR})
qt5_use_modules(fwb_procurve_acl Widgets)

4
src/unit_tests/main/CMakeLists.txt
View File

@ -1,6 +1,4 @@
add_library(test_main STATIC main.cpp)
target_link_libraries(test_main gui)
qt5_use_modules(test_main Test)
target_link_libraries(test_main gui Qt5::Test)