Skip to content

Commit 0b1818d

Browse files
committed
Add module.cmake
1 parent 0a569ba commit 0b1818d

File tree

3 files changed

+30
-23
lines changed

3 files changed

+30
-23
lines changed

build/module.cmake

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
qt_add_library(${MODULE} STATIC)
2+
3+
set_target_properties(${MODULE} PROPERTIES AUTOMOC ON)
4+
5+
qt_add_qml_module(${MODULE}
6+
URI ScratchCPP.${MODULE_URI}
7+
VERSION 1.0
8+
NO_PLUGIN
9+
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ScratchCPP/${MODULE_URI}
10+
QML_FILES
11+
${MODULE_QML_FILES}
12+
)
13+
14+
set(QML_IMPORT_PATH "${QML_IMPORT_PATH};${CMAKE_CURRENT_LIST_DIR}"
15+
CACHE STRING "Qt Creator extra QML import paths"
16+
FORCE
17+
)
18+
19+
list(APPEND QML_IMPORT_PATH ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
20+
list(REMOVE_DUPLICATES QML_IMPORT_PATH)
21+
set(QML_IMPORT_PATH ${QML_IMPORT_PATH} CACHE STRING "" FORCE)
22+
23+
target_link_libraries(appscratchcpp-player PRIVATE ${MODULE})

src/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,3 @@ qt_add_qml_module(appscratchcpp-player
99
)
1010

1111
add_subdirectory(uicomponents)
12-
13-
target_link_libraries(appscratchcpp-player PRIVATE scratchcpp-uicomponents)

src/uicomponents/CMakeLists.txt

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,9 @@
1-
qt_add_library(scratchcpp-uicomponents STATIC)
2-
3-
set_target_properties(scratchcpp-uicomponents PROPERTIES AUTOMOC ON)
4-
5-
qt_add_qml_module(scratchcpp-uicomponents
6-
URI ScratchCPP.UiComponents
7-
VERSION 1.0
8-
NO_PLUGIN
9-
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ScratchCPP/UiComponents
10-
QML_FILES
11-
CustomButton.qml
12-
CustomToolButton.qml
13-
HoverToolTip.qml
14-
)
15-
16-
set(QML_IMPORT_PATH "${QML_IMPORT_PATH};${CMAKE_CURRENT_LIST_DIR}"
17-
CACHE STRING "Qt Creator extra QML import paths"
18-
FORCE
1+
set(MODULE uicomponents)
2+
set(MODULE_URI UiComponents)
3+
set(MODULE_QML_FILES
4+
CustomButton.qml
5+
CustomToolButton.qml
6+
HoverToolTip.qml
197
)
208

21-
list(APPEND QML_IMPORT_PATH ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
22-
list(REMOVE_DUPLICATES QML_IMPORT_PATH)
23-
set(QML_IMPORT_PATH ${QML_IMPORT_PATH} CACHE STRING "" FORCE)
9+
include(${PROJECT_SOURCE_DIR}/build/module.cmake)

0 commit comments

Comments
 (0)