[Piglit] [PATCH] cmake: also install Windows manifest files

Brian Paul brianp at vmware.com
Thu Nov 9 20:51:46 UTC 2017


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



More information about the Piglit mailing list