SWDEV-482553 - Removed setting of BUILD_SHARED_LIBS from hip-config.cmake
Change-Id: I84eb33939d47dde1dd389741c431ee0e5955973b
This commit is contained in:
@@ -425,7 +425,7 @@ configure_package_config_file(
|
||||
)
|
||||
|
||||
configure_package_config_file(
|
||||
hip-config-amd.cmake
|
||||
hip-config-amd.cmake.in
|
||||
${CMAKE_CURRENT_BINARY_DIR}/hip-config-amd.cmake
|
||||
INSTALL_DESTINATION ${CONFIG_PACKAGE_INSTALL_DIR}
|
||||
PATH_VARS LIB_INSTALL_DIR INCLUDE_INSTALL_DIR BIN_INSTALL_DIR
|
||||
|
||||
@@ -69,7 +69,7 @@ endif()
|
||||
# If AMDGPU_TARGETS is not defined by the app, amdgpu-arch is run to find the gpu archs
|
||||
# of all the devices present in the machine
|
||||
if(NOT AMDGPU_TARGETS)
|
||||
if(BUILD_SHARED_LIBS)
|
||||
if(@BUILD_SHARED_LIBS@)
|
||||
if (WIN32)
|
||||
set(AMDGPU_ARCH "${HIP_CLANG_ROOT}/bin/amdgpu-arch.exe")
|
||||
else()
|
||||
@@ -107,7 +107,7 @@ if(NOT AMDGPU_TARGETS)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if (NOT AMDGPU_TARGETS AND NOT BUILD_SHARED_LIBS)
|
||||
if (NOT AMDGPU_TARGETS AND NOT @BUILD_SHARED_LIBS@)
|
||||
# The default architecture is gfx942 for static build
|
||||
set(AMDGPU_TARGETS "gfx942" CACHE STRING "AMD GPU targets to compile for")
|
||||
endif()
|
||||
@@ -122,7 +122,6 @@ endif()
|
||||
if(HIP_PLATFORM STREQUAL "amd")
|
||||
set(HIP_RUNTIME "rocclr")
|
||||
set(HIP_COMPILER "clang")
|
||||
set(BUILD_SHARED_LIBS "@BUILD_SHARED_LIBS@")
|
||||
include( "${hip_LIB_INSTALL_DIR}/cmake/hip/hip-config-amd.cmake" )
|
||||
elseif(HIP_PLATFORM STREQUAL "nvidia")
|
||||
set(HIP_RUNTIME "cuda")
|
||||
|
||||
Reference in New Issue
Block a user