Skip to content

Commit

Permalink
[cmake] modernize Qt libraries linking (#44416)
Browse files Browse the repository at this point in the history
  • Loading branch information
@3nids
3nids committed Jul 28, 2021
1 parent 45d15ba commit 80cf804
Show file tree
Hide file tree
Showing 18 changed files with 69 additions and 69 deletions.
6 changes: 3 additions & 3 deletions src/app/CMakeLists.txt
View file
Expand Up @@ -505,8 +505,8 @@ add_dependencies(qgis_gui ui)
target_link_libraries(qgis_app
${QWT_LIBRARY}
${QWTPOLAR_LIBRARY}
${${QT_VERSION_BASE}Sql_LIBRARIES}
${${QT_VERSION_BASE}UiTools_LIBRARIES}
${QT_VERSION_BASE}::Sql
${QT_VERSION_BASE}::UiTools
${OPTIONAL_QTWEBKIT}
#should only be needed for win
${QT_QTMAIN_LIBRARY}
Expand All @@ -526,7 +526,7 @@ if (WITH_BINDINGS)
endif()

if(ENABLE_MODELTEST)
target_link_libraries(qgis_app ${${QT_VERSION_BASE}Test_LIBRARIES})
target_link_libraries(qgis_app ${QT_VERSION_BASE}::Test)
endif()

if (WITH_3D)
Expand Down
20 changes: 10 additions & 10 deletions src/core/CMakeLists.txt
View file
Expand Up @@ -1974,7 +1974,7 @@ GENERATE_EXPORT_HEADER(
set(QGIS_CORE_HDRS ${QGIS_CORE_HDRS} ${CMAKE_CURRENT_BINARY_DIR}/qgis_core.h)

if(ENABLE_MODELTEST)
target_link_libraries(qgis_core ${${QT_VERSION_BASE}Test_LIBRARIES})
target_link_libraries(qgis_core ${QT_VERSION_BASE}::Test)
endif()

if (NOT WITH_INTERNAL_POLY2TRI)
Expand Down Expand Up @@ -2042,15 +2042,15 @@ if (ADD_CLAZY_CHECKS)
endif()

target_link_libraries(qgis_core
${${QT_VERSION_BASE}Core_LIBRARIES}
${${QT_VERSION_BASE}Gui_LIBRARIES}
${${QT_VERSION_BASE}Xml_LIBRARIES}
${${QT_VERSION_BASE}Widgets_LIBRARIES}
${${QT_VERSION_BASE}Svg_LIBRARIES}
${${QT_VERSION_BASE}PrintSupport_LIBRARIES}
${${QT_VERSION_BASE}Network_LIBRARIES}
${${QT_VERSION_BASE}Sql_LIBRARIES}
${${QT_VERSION_BASE}Concurrent_LIBRARIES}
${QT_VERSION_BASE}::Core
${QT_VERSION_BASE}::Gui
${QT_VERSION_BASE}::Xml
${QT_VERSION_BASE}::Widgets
${QT_VERSION_BASE}::Svg
${QT_VERSION_BASE}::PrintSupport
${QT_VERSION_BASE}::Network
${QT_VERSION_BASE}::Sql
${QT_VERSION_BASE}::Concurrent
${OPTIONAL_QTWEBKIT}
${QCA_LIBRARY}
${QTKEYCHAIN_LIBRARY}
Expand Down
6 changes: 3 additions & 3 deletions src/crashhandler/CMakeLists.txt
View file
Expand Up @@ -29,9 +29,9 @@ add_executable(qgiscrashhandler WIN32
target_compile_features(qgiscrashhandler PRIVATE cxx_std_17)

target_link_libraries(qgiscrashhandler
${${QT_VERSION_BASE}Core_LIBRARIES}
${${QT_VERSION_BASE}Gui_LIBRARIES}
${${QT_VERSION_BASE}Widgets_LIBRARIES}
${QT_VERSION_BASE}::Core
${QT_VERSION_BASE}::Gui
${QT_VERSION_BASE}::Widgets
dbghelp
)

Expand Down
6 changes: 3 additions & 3 deletions src/gui/CMakeLists.txt
View file
Expand Up @@ -1500,10 +1500,10 @@ add_dependencies(qgis_gui ui)
target_link_libraries(qgis_gui
qgis_core
qgis_native
${${QT_VERSION_BASE}UiTools_LIBRARIES}
${QT_VERSION_BASE}::UiTools
${QWT_LIBRARY}
${QSCINTILLA_LIBRARY}
${${QT_VERSION_BASE}QuickWidgets_LIBRARIES}
${QT_VERSION_BASE}::QuickWidgets
)

if (FORCE_STATIC_LIBS)
Expand All @@ -1514,7 +1514,7 @@ if (FORCE_STATIC_LIBS)
endif()

if(ENABLE_MODELTEST)
target_link_libraries(qgis_gui ${${QT_VERSION_BASE}Test_LIBRARIES})
target_link_libraries(qgis_gui ${QT_VERSION_BASE}::Test)
endif()

target_compile_definitions(qgis_gui PRIVATE "-DQT_NO_FOREACH")
Expand Down
2 changes: 1 addition & 1 deletion src/native/CMakeLists.txt
View file
Expand Up @@ -154,7 +154,7 @@ if (MSVC)
find_package(${QT_VERSION_BASE}WinExtras)

target_link_libraries(qgis_native shell32)
target_link_libraries(qgis_native ${${QT_VERSION_BASE}Widget_LIBRARIES} ${QT_QTMAIN_LIBRARY})
target_link_libraries(qgis_native ${QT_VERSION_BASE}::Widget ${QT_QTMAIN_LIBRARY})
target_link_libraries(qgis_native ${QT_VERSION_BASE}::WinExtras)
endif()
# install
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/grass/CMakeLists.txt
View file
Expand Up @@ -220,9 +220,9 @@ macro(ADD_GRASSPLUGIN GRASS_BUILD_VERSION)
)

target_link_libraries (qgis.g.browser${GRASS_BUILD_VERSION}
${${QT_VERSION_BASE}Gui_LIBRARIES}
${${QT_VERSION_BASE}Widgets_LIBRARIES}
${${QT_VERSION_BASE}Core_LIBRARIES}
${QT_VERSION_BASE}::Gui
${QT_VERSION_BASE}::Widgets
${QT_VERSION_BASE}::Core
)

########################################################
Expand Down
2 changes: 1 addition & 1 deletion src/process/CMakeLists.txt
View file
Expand Up @@ -60,7 +60,7 @@ endif()
target_link_libraries(qgis_process
qgis_core
qgis_analysis
${${QT_VERSION_BASE}Core_LIBRARIES}
${QT_VERSION_BASE}::Core
${PROJ_LIBRARY}
${GEOS_LIBRARY}
${GDAL_LIBRARY}
Expand Down
2 changes: 1 addition & 1 deletion src/providers/db2/CMakeLists.txt
View file
Expand Up @@ -46,7 +46,7 @@ target_compile_features(provider_db2 PRIVATE cxx_std_17)

target_link_libraries (provider_db2
qgis_core
${${QT_VERSION_BASE}Sql_LIBRARIES}
${QT_VERSION_BASE}::Sql
)

if (WITH_GUI)
Expand Down
2 changes: 1 addition & 1 deletion src/providers/mssql/CMakeLists.txt
View file
Expand Up @@ -39,7 +39,7 @@ target_compile_features(provider_mssql PRIVATE cxx_std_17)

target_link_libraries(provider_mssql
qgis_core
${${QT_VERSION_BASE}Sql_LIBRARIES}
${QT_VERSION_BASE}::Sql
)

if (WITH_GUI)
Expand Down
2 changes: 1 addition & 1 deletion src/providers/oracle/CMakeLists.txt
View file
Expand Up @@ -54,7 +54,7 @@ target_compile_features(provider_oracle PRIVATE cxx_std_17)

target_link_libraries (provider_oracle
qgis_core
${${QT_VERSION_BASE}Sql_LIBRARIES}
${QT_VERSION_BASE}::Sql
)

if (WITH_GUI)
Expand Down
4 changes: 2 additions & 2 deletions src/providers/oracle/ocispatial/CMakeLists.txt
View file
Expand Up @@ -18,8 +18,8 @@ set(QSQLOCISPATIAL_SRC qsql_ocispatial.cpp main.cpp qsql_ocispatial.h main.h)
add_library(qsqlocispatial SHARED ${QSQLOCISPATIAL_SRC})

target_link_libraries(qsqlocispatial
${${QT_VERSION_BASE}Core_LIBRARIES}
${${QT_VERSION_BASE}Sql_LIBRARIES}
${QT_VERSION_BASE}::Core
${QT_VERSION_BASE}::Sql
${OCI_LIBRARY}
)

Expand Down
36 changes: 18 additions & 18 deletions src/providers/pdal/CMakeLists.txt
View file
Expand Up @@ -126,12 +126,12 @@ target_link_libraries (provider_pdal
if (WITH_GUI)
target_link_libraries (provider_pdal
${PDAL_LIBRARIES}
${${QT_VERSION_BASE}Xml_LIBRARIES}
${${QT_VERSION_BASE}Core_LIBRARIES}
${${QT_VERSION_BASE}Svg_LIBRARIES}
${${QT_VERSION_BASE}Network_LIBRARIES}
${${QT_VERSION_BASE}Sql_LIBRARIES}
${${QT_VERSION_BASE}Concurrent_LIBRARIES}
${QT_VERSION_BASE}::Xml
${QT_VERSION_BASE}::Core
${QT_VERSION_BASE}::Svg
${QT_VERSION_BASE}::Network
${QT_VERSION_BASE}::Sql
${QT_VERSION_BASE}::Concurrent
qgis_gui
)
add_dependencies(provider_pdal ui)
Expand All @@ -145,12 +145,12 @@ target_compile_features(provider_pdal_a PRIVATE cxx_std_17)

target_link_libraries (provider_pdal_a
${PDAL_LIBRARIES}
${${QT_VERSION_BASE}Xml_LIBRARIES}
${${QT_VERSION_BASE}Core_LIBRARIES}
${${QT_VERSION_BASE}Svg_LIBRARIES}
${${QT_VERSION_BASE}Network_LIBRARIES}
${${QT_VERSION_BASE}Sql_LIBRARIES}
${${QT_VERSION_BASE}Concurrent_LIBRARIES}
${QT_VERSION_BASE}::Xml
${QT_VERSION_BASE}::Core
${QT_VERSION_BASE}::Svg
${QT_VERSION_BASE}::Network
${QT_VERSION_BASE}::Sql
${QT_VERSION_BASE}::Concurrent
qgis_core
)

Expand All @@ -162,12 +162,12 @@ if (WITH_GUI)

target_link_libraries (provider_pdal_gui_a
${PDAL_LIBRARIES}
${${QT_VERSION_BASE}Xml_LIBRARIES}
${${QT_VERSION_BASE}Core_LIBRARIES}
${${QT_VERSION_BASE}Svg_LIBRARIES}
${${QT_VERSION_BASE}Network_LIBRARIES}
${${QT_VERSION_BASE}Sql_LIBRARIES}
${${QT_VERSION_BASE}Concurrent_LIBRARIES}
${QT_VERSION_BASE}::Xml
${QT_VERSION_BASE}::Core
${QT_VERSION_BASE}::Svg
${QT_VERSION_BASE}::Network
${QT_VERSION_BASE}::Sql
${QT_VERSION_BASE}::Concurrent
qgis_gui
)
add_dependencies(provider_pdal_gui_a ui)
Expand Down
6 changes: 3 additions & 3 deletions src/providers/virtual/CMakeLists.txt
View file
Expand Up @@ -60,9 +60,9 @@ target_compile_features(provider_virtuallayer PRIVATE cxx_std_17)

target_link_libraries(provider_virtuallayer
qgis_core
${${QT_VERSION_BASE}Core_LIBRARIES}
${${QT_VERSION_BASE}Gui_LIBRARIES}
${${QT_VERSION_BASE}Widgets_LIBRARIES}
${QT_VERSION_BASE}::Core
${QT_VERSION_BASE}::Gui
${QT_VERSION_BASE}::Widgets
${SQLITE3_LIBRARY}
${SPATIALITE_LIBRARY}
)
Expand Down
10 changes: 5 additions & 5 deletions tests/bench/CMakeLists.txt
View file
Expand Up @@ -26,12 +26,12 @@ include_directories(SYSTEM
target_link_libraries(qgis_bench
qgis_core
${SQLITE3_LIBRARY}
${${QT_VERSION_BASE}Core_LIBRARIES}
${${QT_VERSION_BASE}Network_LIBRARIES}
${${QT_VERSION_BASE}Svg_LIBRARIES}
${${QT_VERSION_BASE}Xml_LIBRARIES}
${QT_VERSION_BASE}::Core
${QT_VERSION_BASE}::Network
${QT_VERSION_BASE}::Svg
${QT_VERSION_BASE}::Xml
${OPTIONAL_QTWEBKIT}
${${QT_VERSION_BASE}Test_LIBRARIES}
${QT_VERSION_BASE}::Test
)

if(APPLE)
Expand Down
10 changes: 5 additions & 5 deletions tests/src/3d/sandbox/CMakeLists.txt
View file
Expand Up @@ -32,11 +32,11 @@ target_compile_features(qgis_3d_sandbox PRIVATE cxx_std_17)

set_target_properties(qgis_3d_sandbox PROPERTIES AUTORCC TRUE)
target_link_libraries(qgis_3d_sandbox
${${QT_VERSION_BASE}Xml_LIBRARIES}
${${QT_VERSION_BASE}Core_LIBRARIES}
${${QT_VERSION_BASE}Svg_LIBRARIES}
${${QT_VERSION_BASE}Network_LIBRARIES}
${${QT_VERSION_BASE}Test_LIBRARIES}
${QT_VERSION_BASE}::Xml
${QT_VERSION_BASE}::Core
${QT_VERSION_BASE}::Svg
${QT_VERSION_BASE}::Network
${QT_VERSION_BASE}::Test
${PROJ_LIBRARY}
${GEOS_LIBRARY}
${GDAL_LIBRARY}
Expand Down
2 changes: 1 addition & 1 deletion tests/src/CMakeLists.txt
View file
Expand Up @@ -17,7 +17,7 @@ if (ENABLE_TESTS)
target_compile_features(${TESTNAME} PRIVATE cxx_std_17)
set_target_properties(${TESTNAME} PROPERTIES AUTORCC TRUE)
target_link_libraries(${TESTNAME} ${ARG_QGIS_TEST_LINKEDLIBRARIES})
target_link_libraries(${TESTNAME} ${${QT_VERSION_BASE}Test_LIBRARIES})
target_link_libraries(${TESTNAME} ${QT_VERSION_BASE}::Test)
add_test(${TESTNAME} ${CMAKE_BINARY_DIR}/output/bin/${TESTNAME} -maxwarnings 10000)
if (DEFINED ARG_QGIS_TEST_DEPENDENCIES)
add_dependencies(${TESTNAME} ${ARG_QGIS_TEST_DEPENDENCIES})
Expand Down
8 changes: 4 additions & 4 deletions tests/src/providers/CMakeLists.txt
View file
Expand Up @@ -71,10 +71,10 @@ if(UNIX AND NOT ANDROID AND CMAKE_BUILD_TYPE MATCHES Debug)
)

target_link_libraries(test_provider_wcs
${${QT_VERSION_BASE}Core_LIBRARIES}
${${QT_VERSION_BASE}Network_LIBRARIES}
${${QT_VERSION_BASE}Svg_LIBRARIES}
${${QT_VERSION_BASE}Xml_LIBRARIES}
${QT_VERSION_BASE}::Core
${QT_VERSION_BASE}::Network
${QT_VERSION_BASE}::Svg
${QT_VERSION_BASE}::Xml
${OPTIONAL_QTWEBKIT}
qgis_core
)
Expand Down
8 changes: 4 additions & 4 deletions tests/src/providers/grass/CMakeLists.txt
View file
Expand Up @@ -25,10 +25,10 @@ macro (ADD_QGIS_GRASS_TEST grass_build_version testname testsrc)
COMPILE_FLAGS "-DGRASS_BASE=\\\"${GRASS_PREFIX${grass_build_version}}\\\" \"-DGRASS_BUILD_VERSION=${grass_build_version}\""
)
target_link_libraries(qgis_${testname}${grass_build_version}
${${QT_VERSION_BASE}Xml_LIBRARIES}
${${QT_VERSION_BASE}Core_LIBRARIES}
${${QT_VERSION_BASE}Svg_LIBRARIES}
${${QT_VERSION_BASE}Test_LIBRARIES}
${QT_VERSION_BASE}::Xml
${QT_VERSION_BASE}::Core
${QT_VERSION_BASE}::Svg
${QT_VERSION_BASE}::Test
${PROJ_LIBRARY}
${GEOS_LIBRARY}
${GDAL_LIBRARY}
Expand Down

0 comments on commit 80cf804

Please sign in to comment.