From 80bd9117366816ab44bbeded32cb1facf0889664 Mon Sep 17 00:00:00 2001 From: Chris Freehill Date: Mon, 15 Jun 2020 08:13:53 -0500 Subject: [PATCH] Add rdci to package bin directory Also: * add to the CI bin directory * when making a new manual PDF, don't overwrite the old one; instead, make a copy that can be used to manually replace the existing one, if desired. Change-Id: I9384e3627835a9c9983a55c23417a279a7b4d0f4 [ROCm/rdc commit: c35b0b8ec18f4433ab7b87348f7e191fbe66c604] --- projects/rdc/client/CMakeLists.txt | 2 +- projects/rdc/rdci/CMakeLists.txt | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/projects/rdc/client/CMakeLists.txt b/projects/rdc/client/CMakeLists.txt index 20c0736eb6..347201340e 100755 --- a/projects/rdc/client/CMakeLists.txt +++ b/projects/rdc/client/CMakeLists.txt @@ -181,7 +181,7 @@ if (DOXYGEN_FOUND AND LATEX_FOUND) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/latex/refman.pdf COMMAND make > /dev/null COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/latex/refman.pdf - ${PROJECT_SOURCE_DIR}/docs/${RDC_MANUAL_NAME}.pdf + ${PROJECT_SOURCE_DIR}/docs/${RDC_MANUAL_NAME}_new.pdf DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/latex/refman.tex WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/latex) diff --git a/projects/rdc/rdci/CMakeLists.txt b/projects/rdc/rdci/CMakeLists.txt index 95e92eb835..0a3f7a9057 100644 --- a/projects/rdc/rdci/CMakeLists.txt +++ b/projects/rdc/rdci/CMakeLists.txt @@ -32,6 +32,9 @@ message("Build Configuration:") message("-----------BuildType: " ${CMAKE_BUILD_TYPE}) message("------------Compiler: " ${CMAKE_CXX_COMPILER}) message("-------------Version: " ${CMAKE_CXX_COMPILER_VERSION}) +message("------Install Prefix: " ${CMAKE_INSTALL_PREFIX}) +message("-Pkg.-Install Prefix: " ${CPACK_PACKAGING_INSTALL_PREFIX}) +message("-CMake inst. Bindir : " ${CMAKE_INSTALL_BINDIR}) message("--------Proj Src Dir: " ${PROJECT_SOURCE_DIR}) message("--------Proj Bld Dir: " ${PROJECT_BINARY_DIR}) message("--------Proj Lib Dir: " ${PROJECT_BINARY_DIR}/lib) @@ -87,6 +90,12 @@ add_executable(${RDCI_EXE} "${RDCI_SRC_LIST}") target_link_libraries(${RDCI_EXE} pthread dl rdc_bootstrap) +## Add the install directives for the rdci executable +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RDCI_EXE} + PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE + COMPONENT ${CLIENT_COMPONENT} + DESTINATION ${RDC}/bin) message("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&")