Skip to content

Commit 3739adc

Browse files
committed
Add Qt Widgets module
1 parent f0ab317 commit 3739adc

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
77

88
option(SCRATCHCPP_PLAYER_BUILD_UNIT_TESTS "Build unit tests" ON)
99

10-
find_package(Qt6 6.6 COMPONENTS Quick QuickControls2 REQUIRED)
10+
find_package(Qt6 6.6 COMPONENTS Quick QuickControls2 Widgets REQUIRED)
11+
set(QT_LIBS Qt6::Quick Qt6::QuickControls2 Qt6::Widgets)
1112

1213
if (SCRATCHCPP_PLAYER_BUILD_UNIT_TESTS)
1314
set(GTEST_DIR thirdparty/googletest)

build/module.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ set(QML_IMPORT_PATH "${QML_IMPORT_PATH};${CMAKE_CURRENT_LIST_DIR}"
1919
FORCE
2020
)
2121

22+
target_link_libraries(${MODULE} PRIVATE ${QT_LIBS})
23+
2224
list(APPEND QML_IMPORT_PATH ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
2325
list(REMOVE_DUPLICATES QML_IMPORT_PATH)
2426
set(QML_IMPORT_PATH ${QML_IMPORT_PATH} CACHE STRING "" FORCE)

src/app/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ set_target_properties(${APP_TARGET} PROPERTIES
3434
target_compile_definitions(${APP_TARGET}
3535
PRIVATE $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:QT_QML_DEBUG>)
3636
target_compile_definitions(${APP_TARGET} PRIVATE BUILD_VERSION="${CMAKE_PROJECT_VERSION}")
37-
target_link_libraries(${APP_TARGET}
38-
PRIVATE Qt6::Quick Qt6::QuickControls2)
37+
target_link_libraries(${APP_TARGET} PRIVATE ${QT_LIBS})
3938
target_include_directories(${APP_TARGET} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..)
4039
target_include_directories(${APP_TARGET} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../global)
4140

0 commit comments

Comments
 (0)