sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-22 00:06:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update qt_unix_signals for qt 6 compatibility

Browse Source
This commit is contained in:
Nyall Dawson 2022-08-16 14:19:42 +10:00
parent f3ea3b6abe
commit 5c54f8624a
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
external/qt-unix-signals/CMakeLists.txt vendored
View File

@ -7,11 +7,16 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
set(QTSignal_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "QTSignal Include Dir")
find_package(Qt5Core REQUIRED)
if (BUILD_WITH_QT6)
set(_QT_VERSION_BASE "Qt6")
else()
set(_QT_VERSION_BASE "Qt5")
endif(BUILD_WITH_QT6)
find_package(${QT_VERSION_BASE} COMPONENTS Core REQUIRED)
if (Qt5_POSITION_INDEPENDENT_CODE)
if (${QT_VERSION_BASE}_POSITION_INDEPENDENT_CODE)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
endif(Qt5_POSITION_INDEPENDENT_CODE)
endif(${QT_VERSION_BASE}_POSITION_INDEPENDENT_CODE)
set(CMAKE_CXX_STANDARD 11)
@ -24,10 +29,13 @@ set(CMAKE_AUTOMOC ON)
unset(CMAKE_CXX_VISIBILITY_PRESET)
include_directories(${Qt5Core_INCLUDE_DIRS})
add_library(QTSignal STATIC sigwatch.cpp)
target_link_libraries (QTSignal ${Qt5Core_LIBRARIES})
target_include_directories(QTSignal SYSTEM PUBLIC
${${QT_VERSION_BASE}Core_INCLUDE_DIRS}
)
target_link_libraries(QTSignal
${QT_VERSION_BASE}::Core
)
#option(WITH_EXAMPLE "Build example executable" ON)
#if (WITH_EXAMPLE)
# add_executable (sigwatch-demo example.cpp )