From 0b8bc6682fa00ffd7b6420ca749380d8a5c5554a Mon Sep 17 00:00:00 2001 From: Ioannis Assiouras Date: Mon, 9 Sep 2024 13:27:53 +0100 Subject: [PATCH] SWDEV-482553 - Removed setting of BUILD_SHARED_LIBS from hip-config.cmake Change-Id: I84eb33939d47dde1dd389741c431ee0e5955973b --- hipamd/CMakeLists.txt | 2 +- hipamd/{hip-config-amd.cmake => hip-config-amd.cmake.in} | 4 ++-- hipamd/hip-config.cmake.in | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) rename hipamd/{hip-config-amd.cmake => hip-config-amd.cmake.in} (98%) diff --git a/hipamd/CMakeLists.txt b/hipamd/CMakeLists.txt index 63a94898a7..39e59b4548 100755 --- a/hipamd/CMakeLists.txt +++ b/hipamd/CMakeLists.txt @@ -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 diff --git a/hipamd/hip-config-amd.cmake b/hipamd/hip-config-amd.cmake.in similarity index 98% rename from hipamd/hip-config-amd.cmake rename to hipamd/hip-config-amd.cmake.in index 1ac1716eb9..a04d65cf3e 100755 --- a/hipamd/hip-config-amd.cmake +++ b/hipamd/hip-config-amd.cmake.in @@ -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() diff --git a/hipamd/hip-config.cmake.in b/hipamd/hip-config.cmake.in index d8565603e1..8b63fdc8bb 100755 --- a/hipamd/hip-config.cmake.in +++ b/hipamd/hip-config.cmake.in @@ -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")