From a2c162f85e7edc3b59af510b27b4b7701618db27 Mon Sep 17 00:00:00 2001 From: Evgeny Mankov Date: Mon, 28 Oct 2019 21:07:00 +0300 Subject: [PATCH] [HIP][cmake] Move all *_INSTALL_DIR variables up before first add_subdirectory() [REASON] Those vars (may) used by cmake in subdirectories (#1571) [ROCm/hip commit: b089d905c6d1100024cd5a2d210a2e154a5537a0] --- projects/hip/CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/hip/CMakeLists.txt b/projects/hip/CMakeLists.txt index 57369a9039..7aeb415bcc 100644 --- a/projects/hip/CMakeLists.txt +++ b/projects/hip/CMakeLists.txt @@ -224,6 +224,11 @@ endif() ############################# # Build steps ############################# +set(BIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin) +set(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib) +set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include) +set(CONFIG_PACKAGE_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/hip) + # Build clang hipify if enabled if (BUILD_HIPIFY_CLANG) add_subdirectory(hipify-clang) @@ -370,11 +375,6 @@ endif() ############################# # hip-config ############################# -set(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib) -set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include) -set(BIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin) -set(CONFIG_PACKAGE_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/hip) - if(HIP_PLATFORM STREQUAL "hcc") install(TARGETS hip_hcc_static hip_hcc host device EXPORT hip-targets DESTINATION ${LIB_INSTALL_DIR}) install(EXPORT hip-targets DESTINATION ${CONFIG_PACKAGE_INSTALL_DIR} NAMESPACE hip::)