CMake 2.8.12 and lower allowed the SOURCE signature in add_custom_command

In CMake 3.0 the policy CMP0050 was introduced where it could be set to OLD to keep this behaviour while for NEW an error was raised.
Since CMake 3.5.2 a warning comes up when using the OLD behaviour and that it will be removed in a future version.

In FreeCAD we switched to the new behaviour now and removed the SOURCE signature from add_custom_command which affects the macros
fc_copy_sources, fc_target_copy_resource and fc_target_copy_resource_flat and their usage.
It's not possible any more to add files to a target by using the macros. Now a file must be added to the target before using the macros.

This commit fixes it for Arch, Draft, OpenSCAD, Material, Plot and Ship
This commit is contained in:
wmayer
2018-08-20 11:47:39 +02:00
parent bff245daef
commit 16295d4121
7 changed files with 82 additions and 59 deletions

View File

@@ -24,12 +24,18 @@ SET(Draft_SRCS
)
SOURCE_GROUP("" FILES ${Draft_SRCS})
SET(DraftGuiIcon_SVG
Resources/icons/DraftWorkbench.svg
)
ADD_CUSTOM_TARGET(Draft ALL
SOURCES ${Draft_SRCS} ${Draft_QRC_SRCS}
SOURCES ${Draft_SRCS} ${Draft_QRC_SRCS} ${DraftGuiIcon_SVG}
)
fc_copy_sources(Draft "${CMAKE_BINARY_DIR}/Mod/Draft" ${Draft_SRCS})
fc_copy_sources(Draft "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Draft" ${DraftGuiIcon_SVG})
IF (BUILD_GUI)
fc_target_copy_resource(Draft
${CMAKE_CURRENT_BINARY_DIR}
@@ -45,10 +51,10 @@ INSTALL(
Mod/Draft
)
SET(DraftGuiIcon_SVG
Resources/icons/DraftWorkbench.svg
INSTALL(
FILES
${DraftGuiIcon_SVG}
DESTINATION
"${CMAKE_INSTALL_DATADIR}/Mod/Draft/Resources/icons"
)
fc_copy_sources(Draft "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Draft" ${DraftGuiIcon_SVG})
INSTALL(FILES ${DraftGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Draft/Resources/icons")