Skip to content

Commit 4f05e52

Browse files
committed
cmake: Update for Qt6
1 parent e9c94d3 commit 4f05e52

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

cppproperties/CMakeLists.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ set(HEADERS_PUBLIC
2121
)
2222

2323
set(HEADERS_QT_WIDGETS_PUBLIC
24-
qt_widgets/factory.hpp
25-
qt_widgets/widget_base.hpp
26-
qt_widgets/boolean.hpp
27-
qt_widgets/integer.hpp
28-
qt_widgets/nested.hpp
24+
${CMAKE_CURRENT_LIST_DIR}/qt_widgets/factory.hpp
25+
${CMAKE_CURRENT_LIST_DIR}/qt_widgets/widget_base.hpp
26+
${CMAKE_CURRENT_LIST_DIR}/qt_widgets/boolean.hpp
27+
${CMAKE_CURRENT_LIST_DIR}/qt_widgets/integer.hpp
28+
${CMAKE_CURRENT_LIST_DIR}/qt_widgets/nested.hpp
2929
)
3030

3131
add_library(${TARGET} INTERFACE IMPORTED GLOBAL)
@@ -57,12 +57,12 @@ target_link_libraries(
5757
${TARGET}
5858
INTERFACE
5959
$<$<BOOL:${CPPPROPERTIES_ENABLE_BOOST}>:Boost::headers>
60-
$<$<BOOL:${CPPPROPERTIES_ENABLE_QT}>:Qt5::Core>
60+
$<$<BOOL:${CPPPROPERTIES_ENABLE_QT}>:Qt::Core>
6161
$<$<BOOL:${CPPPROPERTIES_ENABLE_GPDS}>:gpds::gpds-shared>
6262
$<$<BOOL:${CPPPROPERTIES_ENABLE_JSON}>:nlohmann_json::nlohmann_json>
6363
$<$<BOOL:${CPPPROPERTIES_ENABLE_XML}>:tinyxml2::tinyxml2>
64-
$<$<BOOL:${CPPPROPERTIES_ENABLE_QT_WIDGETS}>:Qt5::Gui>
65-
$<$<BOOL:${CPPPROPERTIES_ENABLE_QT_WIDGETS}>:Qt5::Widgets>
64+
$<$<BOOL:${CPPPROPERTIES_ENABLE_QT_WIDGETS}>:Qt::Gui>
65+
$<$<BOOL:${CPPPROPERTIES_ENABLE_QT_WIDGETS}>:Qt::Widgets>
6666
)
6767

6868
if (CPPPROPERTIES_ENABLE_QT_WIDGETS)

cppproperties/external.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
include(FetchContent)
22

3-
# Qt5
3+
# Qt
44
if (CPPPROPERTIES_ENABLE_QT)
55
find_package(
6-
Qt5
6+
Qt6
77
REQUIRED
88
COMPONENTS
99
Core
1010
)
1111
endif()
1212
if (CPPPROPERTIES_ENABLE_QT_WIDGETS)
1313
find_package(
14-
Qt5
14+
Qt6
1515
REQUIRED
1616
COMPONENTS
1717
Gui

0 commit comments

Comments
 (0)