From a5c7620d24e44b80c60818b54cae9b2ad448549d Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 2 Aug 2016 16:02:41 +0200 Subject: [PATCH] Add install rules for renderdoc lib & binaries --- qrenderdoc/CMakeLists.txt | 2 ++ renderdoc/CMakeLists.txt | 2 ++ renderdoc/driver/vulkan/CMakeLists.txt | 4 +++- renderdoccmd/CMakeLists.txt | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/qrenderdoc/CMakeLists.txt b/qrenderdoc/CMakeLists.txt index 4ac410fc0..b567863df 100644 --- a/qrenderdoc/CMakeLists.txt +++ b/qrenderdoc/CMakeLists.txt @@ -8,3 +8,5 @@ add_custom_command(OUTPUT QRenderDoc COMMAND qmake "CONFIG+=debug" "DESTDIR=${output_dir}" ${CMAKE_CURRENT_SOURCE_DIR} COMMAND MAKEFLAGS= make --no-print-directory) add_custom_target(build-qrenderdoc ALL DEPENDS QRenderDoc) + +install (PROGRAMS ${output_dir}/qrenderdoc DESTINATION bin) diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt index 154491797..725da262e 100644 --- a/renderdoc/CMakeLists.txt +++ b/renderdoc/CMakeLists.txt @@ -263,3 +263,5 @@ add_library(renderdoc SHARED ${renderdoc_objects}) target_compile_definitions(renderdoc ${RDOC_DEFINITIONS}) target_include_directories(renderdoc ${RDOC_INCLUDES}) target_link_libraries(renderdoc ${RDOC_LIBRARIES}) + +install (TARGETS renderdoc DESTINATION lib) diff --git a/renderdoc/driver/vulkan/CMakeLists.txt b/renderdoc/driver/vulkan/CMakeLists.txt index 67704fc78..2bf32ba9d 100644 --- a/renderdoc/driver/vulkan/CMakeLists.txt +++ b/renderdoc/driver/vulkan/CMakeLists.txt @@ -53,9 +53,11 @@ elseif(UNIX) set(json_in ${CMAKE_CURRENT_SOURCE_DIR}/renderdoc.json) set(json_out ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/renderdoc_capture.json) add_custom_command(OUTPUT ${json_out} - COMMAND sed '{s%...renderdoc.dll%./librenderdoc.so%}' < ${json_in} > ${json_out} + COMMAND sed '{s%...renderdoc.dll%librenderdoc.so%}' < ${json_in} > ${json_out} DEPENDS ${json_in}) add_custom_target(generate-json ALL DEPENDS ${json_out}) + + install (FILES ${json_out} DESTINATION share/vulkan/implicit_layer.d) endif() add_library(rdoc_vulkan OBJECT ${sources}) diff --git a/renderdoccmd/CMakeLists.txt b/renderdoccmd/CMakeLists.txt index f53fd3b8c..a7cfd1a6b 100644 --- a/renderdoccmd/CMakeLists.txt +++ b/renderdoccmd/CMakeLists.txt @@ -25,3 +25,5 @@ else() endif() target_include_directories(renderdoccmd ${includes}) target_link_libraries(renderdoccmd ${libraries}) + +install (TARGETS renderdoccmd DESTINATION bin)