Fix CMake warning: qt5_make_output_file is not part of the official API, and might be removed in Qt 6.
This commit is contained in:
committed by
wwmayer
parent
3f3df7d8e3
commit
9ade68e9bf
@@ -13,21 +13,15 @@ set(SpreadsheetGui_LIBS
|
||||
FreeCADGui
|
||||
)
|
||||
|
||||
set(SpreadsheetGui_MOC_HDRS
|
||||
LineEdit.h
|
||||
SpreadsheetView.h
|
||||
SheetModel.h
|
||||
SheetTableView.h
|
||||
SpreadsheetDelegate.h
|
||||
Workbench.h
|
||||
PropertiesDialog.h
|
||||
qtcolorpicker.h
|
||||
)
|
||||
|
||||
if(BUILD_QT5)
|
||||
set_property(SOURCE qtcolorpicker.h qtcolorpicker.cpp PROPERTY SKIP_AUTOMOC ON)
|
||||
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/moc_qtcolorpicker-internal.cpp
|
||||
COMMAND ${Qt5Core_MOC_EXECUTABLE} -o ${CMAKE_CURRENT_BINARY_DIR}/moc_qtcolorpicker-internal.cpp ${CMAKE_CURRENT_SOURCE_DIR}/qtcolorpicker.cpp
|
||||
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/qtcolorpicker.cpp)
|
||||
|
||||
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/moc_qtcolorpicker.cpp
|
||||
COMMAND ${Qt5Core_MOC_EXECUTABLE} -o ${CMAKE_CURRENT_BINARY_DIR}/moc_qtcolorpicker.cpp ${CMAKE_CURRENT_SOURCE_DIR}/qtcolorpicker.h
|
||||
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/qtcolorpicker.h)
|
||||
else()
|
||||
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/moc_qtcolorpicker-internal.cpp
|
||||
COMMAND ${QT_MOC_EXECUTABLE} -o ${CMAKE_CURRENT_BINARY_DIR}/moc_qtcolorpicker-internal.cpp ${CMAKE_CURRENT_SOURCE_DIR}/qtcolorpicker.cpp
|
||||
@@ -35,10 +29,7 @@ else()
|
||||
endif()
|
||||
|
||||
set_property(SOURCE qtcolorpicker.cpp APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/moc_qtcolorpicker-internal.cpp)
|
||||
|
||||
fc_wrap_cpp(SpreadsheetGui_MOC_SRCS ${SpreadsheetGui_MOC_HDRS})
|
||||
SOURCE_GROUP("Moc" FILES ${SpreadsheetGui_MOC_SRCS})
|
||||
|
||||
set_property(SOURCE qtcolorpicker.h APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/moc_qtcolorpicker.cpp)
|
||||
|
||||
SET(SpreadsheetGui_RES_SRCS
|
||||
Resources/Spreadsheet.qrc
|
||||
@@ -62,7 +53,6 @@ else()
|
||||
endif()
|
||||
|
||||
SET(SpreadsheetGui_SRCS
|
||||
# ${SpreadsheetGui_MOC_SRCS}
|
||||
${SpreadsheetGui_QRC_SRCS}
|
||||
AppSpreadsheetGui.cpp
|
||||
Command.cpp
|
||||
|
||||
Reference in New Issue
Block a user