CMake: change link type and remove Qt Widgets (#53)

Link type can be changed to PRIVATE. Only Qt Core will remain
as PUBLIC linking.

It looks like that Qt Widgets is not needed and can be removed.
On Qt6, Qt6::Gui is strictly needed.
This commit is contained in:
Daniel Bermond
2021-10-03 14:07:20 +03:00
committed by GitHub
parent dbec7d3a2d
commit 79e5dd65be
+15 -18
View File
@@ -10,9 +10,9 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(QT_MAJOR 5 CACHE STRING "Qt major version to use") set(QT_MAJOR 5 CACHE STRING "Qt major version to use")
if(QT_MAJOR EQUAL 6) if(QT_MAJOR EQUAL 6)
find_package(Qt${QT_MAJOR} 6.2.0 COMPONENTS Core Widgets REQUIRED) find_package(Qt${QT_MAJOR} 6.2.0 COMPONENTS Core Gui REQUIRED)
else() else()
find_package(Qt${QT_MAJOR} COMPONENTS Core Widgets REQUIRED) find_package(Qt${QT_MAJOR} COMPONENTS Core Gui REQUIRED)
endif() endif()
if(QT_MAJOR GREATER_EQUAL 6) if(QT_MAJOR GREATER_EQUAL 6)
@@ -25,38 +25,35 @@ else()
QHotkey/qhotkey_p.h) QHotkey/qhotkey_p.h)
endif() endif()
set(LIBS add_library(qhotkey QHotkey/qhotkey.cpp ${MOC_HEADERS})
Qt${QT_MAJOR}::Core add_library(QHotkey::QHotkey ALIAS qhotkey)
Qt${QT_MAJOR}::Widgets) target_link_libraries(qhotkey PUBLIC Qt${QT_MAJOR}::Core)
target_link_libraries(qhotkey PRIVATE Qt${QT_MAJOR}::Gui)
set(SRC_FILES
QHotkey/qhotkey.cpp)
if(APPLE) if(APPLE)
find_library(CARBON_LIBRARY Carbon) find_library(CARBON_LIBRARY Carbon)
mark_as_advanced(CARBON_LIBRARY) mark_as_advanced(CARBON_LIBRARY)
set(SRC_FILES ${SRC_FILES} QHotkey/qhotkey_mac.cpp) target_sources(qhotkey PRIVATE QHotkey/qhotkey_mac.cpp)
set(LIBS ${LIBS} ${CARBON_LIBRARY}) target_link_libraries(qhotkey PRIVATE ${CARBON_LIBRARY})
elseif(WIN32) elseif(WIN32)
set(SRC_FILES ${SRC_FILES} QHotkey/qhotkey_win.cpp) target_sources(qhotkey PRIVATE QHotkey/qhotkey_win.cpp)
else() else()
find_package(X11 REQUIRED) find_package(X11 REQUIRED)
if(QT_MAJOR GREATER_EQUAL 6) if(QT_MAJOR GREATER_EQUAL 6)
set(LIBS ${LIBS} ${X11_LIBRARIES}) target_link_libraries(qhotkey PRIVATE ${X11_LIBRARIES})
else() else()
find_package(Qt${QT_MAJOR}X11Extras REQUIRED) find_package(Qt${QT_MAJOR}X11Extras REQUIRED)
set(LIBS ${LIBS} ${X11_LIBRARIES} Qt${QT_MAJOR}::X11Extras) target_link_libraries(qhotkey
PRIVATE
${X11_LIBRARIES}
Qt${QT_MAJOR}::X11Extras)
endif() endif()
include_directories(${X11_INCLUDE_DIR}) include_directories(${X11_INCLUDE_DIR})
set(SRC_FILES ${SRC_FILES} QHotkey/qhotkey_x11.cpp) target_sources(qhotkey PRIVATE QHotkey/qhotkey_x11.cpp)
endif() endif()
add_library(qhotkey ${SRC_FILES} ${MOC_HEADERS})
add_library(QHotkey::QHotkey ALIAS qhotkey)
target_link_libraries(qhotkey ${LIBS})
include(GNUInstallDirs) include(GNUInstallDirs)
target_include_directories(qhotkey target_include_directories(qhotkey