On 09/11/17 20:51, Brian Paul wrote:
The previous patch (5087aa3f1020d0 "cmake: create Win10 manifest files for particular executables") didn't copy the manifest files when doing 'make install'.This fixes that. It requires CMake 3.0 or later. Thanks to Brad King for helping out! --- cmake/piglit_util.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/piglit_util.cmake b/cmake/piglit_util.cmake index 9b85761..918ea84 100644 --- a/cmake/piglit_util.cmake +++ b/cmake/piglit_util.cmake @@ -114,8 +114,11 @@ function(piglit_create_manifest_file target) # the manifest file, but I've been unsuccessful in getting # that to work. file(GENERATE - OUTPUT bin/${target}.exe.manifest + OUTPUT $<TARGET_FILE:${target}>.manifest INPUT ${CMAKE_SOURCE_DIR}/cmake/win10-manifest.txt) + + install(FILES $<TARGET_FILE:${target}>.manifest + DESTINATION ${PIGLIT_INSTALL_LIBDIR}/bin) endif() endif() endfunction(piglit_create_manifest_file)
Looks great! Reviewed-by: Jose Fonseca <jfons...@vmware.com> _______________________________________________ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
