move cmake policy CMP0050 to new style

This commit is contained in:
wmayer
2018-08-19 13:59:42 +02:00
parent fc6e6a55ea
commit 3ffd435526
4 changed files with 1 additions and 16 deletions

View File

@@ -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)

View File

@@ -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}
)

View File

@@ -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
)

View File

@@ -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)