@@ -141,34 +141,23 @@ set(qan_qml_files
141141
142142# Configure Qt
143143set (CMAKE_AUTOMOC ON )
144- qt_wrap_cpp (qan_source_files, qan_header_files) # Creates .moc files from sources
144+ # qt_wrap_cpp(qan_moc_files ${ qan_header_files} ) # Creates .moc files from sources
145145set (CMAKE_AUTORCC ON )
146146set_property (DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS $<$<CONFIG:Debug>:QT_QML_DEBUG>)
147147
148148# Configure QuickQanava library ###############################################
149149
150- # FIXME #248
151- # list(APPEND qan_resources QuickQanava_static.qrc)
152- # add_library(QuickQanava STATIC
153- # ${qan_source_files}
154- # ${qan_header_files}
155- # ${quickcontainers_source_files}
156- # ${quickcontainers_header_files}
157- # ${qan_resources}
158- # )
159-
160150# qt_add_library(QuickQanava STATIC)
161151qt_add_qml_module(QuickQanava
162152 STATIC
163153 URI QuickQanava
164154 # VERSION 2.5
165155 SOURCES
166- ${qan_source_files} ${qan_header_files} ${quickcontainers_source_files} ${quickcontainers_header_files}
156+ ${qan_source_files} ${qan_header_files} ${qan_moc_files} ${ quickcontainers_source_files} ${quickcontainers_header_files}
167157 QML_FILES
168158 ${qan_qml_files}
169159 RESOURCE_PREFIX /
170160 OUTPUT_DIRECTORY QuickQanava
171- #RESOURCE QuickQanava_static.qrc
172161)
173162set (QT_QML_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR} /QuickQanava)
174163
@@ -178,24 +167,6 @@ target_include_directories(QuickQanava
178167 $<INSTALL_INTERFACE:include >
179168)
180169
181- # target_compile_features(QuickQanava
182- # PUBLIC
183- # cxx_std_17
184- # )
185-
186- # install(FILES
187- # ${qan_header_files}
188- # DESTINATION include/quickqanava
189- # )
190-
191- # install(TARGETS QuickQanava
192- # EXPORT Targets
193- # LIBRARY DESTINATION lib
194- # ARCHIVE DESTINATION lib
195- # RUNTIME DESTINATION bin
196- # INCLUDES DESTINATION include/quickqanava
197- # )
198-
199170set (CMAKE_INCLUDE_CURRENT_DIR ON )
200171target_link_libraries (QuickQanava PUBLIC Qt6::Core
201172 Qt6::Gui
0 commit comments