summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2017-11-09 13:45:05 -0700
committerBrian Paul <brianp@vmware.com>2017-11-10 11:12:51 -0700
commit9ff39d330dd14135802ab99eec6ab3a96419bd2f (patch)
tree4979b3048db688bcf252c1f2b958e4f173c90c6c /cmake
parent134d8f6e61941ad01afb9d18e8c1009c1d02c27b (diff)
cmake: also install Windows manifest files
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! Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/piglit_util.cmake5
1 files changed, 4 insertions, 1 deletions
diff --git a/cmake/piglit_util.cmake b/cmake/piglit_util.cmake
index 9b857619b..918ea8421 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)