[HIPIFY][cmake][#1572] Fix: Do not override CMAKE_INSTALL_PREFIX
Affects building with HIP, standalone building is not changed
[ROCm/clr commit: e79fd55d01]
Este cometimento está contido em:
@@ -81,27 +81,28 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
|
|||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} ${StdCpp} -DHIPIFY_CLANG_RES=\\\"${LLVM_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}\\\"")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} ${StdCpp} -DHIPIFY_CLANG_RES=\\\"${LLVM_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}\\\"")
|
||||||
|
|
||||||
set(INSTALL_PATH_DOC_STRING "Installation path for hipify-clang")
|
set(INSTALL_PATH_DOC_STRING "Installation path for hipify-clang")
|
||||||
|
set(HIPIFY_INSTALL_PATH ${CMAKE_INSTALL_PREFIX})
|
||||||
if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
|
if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
|
||||||
if(CMAKE_BUILD_TYPE MATCHES Debug)
|
if(CMAKE_BUILD_TYPE MATCHES Debug)
|
||||||
set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/bin" CACHE PATH ${INSTALL_PATH_DOC_STRING} FORCE)
|
set(HIPIFY_INSTALL_PATH "${CMAKE_CURRENT_SOURCE_DIR}/bin" CACHE PATH ${INSTALL_PATH_DOC_STRING} FORCE)
|
||||||
elseif(CMAKE_BUILD_TYPE MATCHES Release)
|
elseif(CMAKE_BUILD_TYPE MATCHES Release)
|
||||||
if (BIN_INSTALL_DIR)
|
if (BIN_INSTALL_DIR)
|
||||||
set(CMAKE_INSTALL_PREFIX "${BIN_INSTALL_DIR}" CACHE PATH ${INSTALL_PATH_DOC_STRING} FORCE)
|
set(HIPIFY_INSTALL_PATH "${BIN_INSTALL_DIR}" CACHE PATH ${INSTALL_PATH_DOC_STRING} FORCE)
|
||||||
else()
|
else()
|
||||||
set(CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/bin" CACHE PATH ${INSTALL_PATH_DOC_STRING} FORCE)
|
set(HIPIFY_INSTALL_PATH "${PROJECT_BINARY_DIR}/bin" CACHE PATH ${INSTALL_PATH_DOC_STRING} FORCE)
|
||||||
endif()
|
endif()
|
||||||
else()
|
else()
|
||||||
message(FATAL_ERROR "Invalid CMAKE_BUILD_TYPE specified. Valid values are Debug and Release")
|
message(FATAL_ERROR "Invalid CMAKE_BUILD_TYPE specified. Valid values are Debug and Release")
|
||||||
endif()
|
endif()
|
||||||
elseif(BIN_INSTALL_DIR)
|
elseif(BIN_INSTALL_DIR)
|
||||||
set(CMAKE_INSTALL_PREFIX "${BIN_INSTALL_DIR}" CACHE PATH ${INSTALL_PATH_DOC_STRING} FORCE)
|
set(HIPIFY_INSTALL_PATH "${BIN_INSTALL_DIR}" CACHE PATH ${INSTALL_PATH_DOC_STRING} FORCE)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
install(TARGETS hipify-clang DESTINATION ${CMAKE_INSTALL_PREFIX})
|
install(TARGETS hipify-clang DESTINATION ${HIPIFY_INSTALL_PATH})
|
||||||
|
|
||||||
install(
|
install(
|
||||||
DIRECTORY ${LLVM_DIR}/../../clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/
|
DIRECTORY ${LLVM_DIR}/../../clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/
|
||||||
DESTINATION ${CMAKE_INSTALL_PREFIX}
|
DESTINATION ${HIPIFY_INSTALL_PATH}
|
||||||
COMPONENT clang-resource-headers
|
COMPONENT clang-resource-headers
|
||||||
FILES_MATCHING
|
FILES_MATCHING
|
||||||
PATTERN "*.h"
|
PATTERN "*.h"
|
||||||
|
|||||||
Criar uma nova questão referindo esta
Bloquear um utilizador