diff --git a/CMakeLists.txt b/CMakeLists.txt index 77a37448d2..9cbfbc10ac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ if(COMMAND cmake_policy) endif(POLICY CMP0020) # added in cmake 3.0 if(POLICY CMP0050) - cmake_policy(SET CMP0050 OLD) + cmake_policy(SET CMP0050 NEW) endif(POLICY CMP0050) if (POLICY CMP0045) cmake_policy(SET CMP0045 NEW) diff --git a/cMake/FreeCadMacros.cmake b/cMake/FreeCadMacros.cmake index 61f6ee8130..4a491f74ea 100644 --- a/cMake/FreeCadMacros.cmake +++ b/cMake/FreeCadMacros.cmake @@ -51,7 +51,6 @@ MACRO (fc_copy_sources target_name outpath) get_filename_component(outfile "${outpath}/${it}" ABSOLUTE) add_file_dependencies("${infile}" "${outfile}") ADD_CUSTOM_COMMAND( - SOURCE "${infile}" COMMAND "${CMAKE_COMMAND}" -E copy "${infile}" "${outfile}" TARGET ${target_name} OUTPUTS "${outfile}" @@ -59,7 +58,6 @@ MACRO (fc_copy_sources target_name outpath) ) endforeach(it) ADD_CUSTOM_COMMAND( - SOURCE ${target_name} TARGET ${target_name} DEPENDS ${ARGN} ) @@ -76,7 +74,6 @@ MACRO (fc_target_copy_resource target_name inpath outpath) get_filename_component(outfile "${outpath}/${it}" ABSOLUTE) add_file_dependencies("${infile}" "${outfile}") ADD_CUSTOM_COMMAND( - SOURCE "${infile}" COMMAND "${CMAKE_COMMAND}" -E copy "${infile}" "${outfile}" TARGET ${target_name} OUTPUTS "${outfile}" @@ -84,7 +81,6 @@ MACRO (fc_target_copy_resource target_name inpath outpath) ) endforeach(it) ADD_CUSTOM_COMMAND( - SOURCE ${target_name} TARGET ${target_name} DEPENDS ${ARGN} ) diff --git a/src/Mod/Fem/Gui/CMakeLists.txt b/src/Mod/Fem/Gui/CMakeLists.txt index ed7479ee56..c302b91fae 100755 --- a/src/Mod/Fem/Gui/CMakeLists.txt +++ b/src/Mod/Fem/Gui/CMakeLists.txt @@ -375,12 +375,6 @@ add_library(FemGui SHARED ${FemGui_SRCS}) target_link_libraries(FemGui ${FemGui_LIBS} ${VTK_LIBRARIES}) -fc_target_copy_resource(FemGui - ${CMAKE_SOURCE_DIR}/src/Mod/Fem - ${CMAKE_BINARY_DIR}/Mod/Fem - ) - - SET(FemGuiIcon_SVG Resources/icons/FemWorkbench.svg ) diff --git a/src/Mod/Path/App/CMakeLists.txt b/src/Mod/Path/App/CMakeLists.txt index a65ace6a1a..89b162ff24 100644 --- a/src/Mod/Path/App/CMakeLists.txt +++ b/src/Mod/Path/App/CMakeLists.txt @@ -125,11 +125,6 @@ fc_target_copy_resource(Path ${CMAKE_BINARY_DIR}/Mod/Path ${Path_Scripts}) -fc_target_copy_resource(Path - ${CMAKE_SOURCE_DIR}/src/Mod/Path - ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Path - ${Path_Resources}) - SET_BIN_DIR(Path Path /Mod/Path) SET_PYTHON_PREFIX_SUFFIX(Path)