From 3a84fcd13ed1df94de6a6ba6ca41ebffb3f09627 Mon Sep 17 00:00:00 2001 From: Vlad Sytchenko Date: Tue, 2 Jun 2020 16:23:08 -0400 Subject: [PATCH] Handle the option USE_COMGR_LIBRARY correctly This is a follow up to http://gerrit-git.amd.com/c/compute/ec/vdi/+/359563. The setting is now either ON or OFF, never "yes". Change-Id: I031d013a8d239dc72ef610da81bd31b8b78a3ba8 --- rocclr/CMakeLists.txt | 2 +- rocclr/device/rocm/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rocclr/CMakeLists.txt b/rocclr/CMakeLists.txt index 152b28a2ba..122277eec2 100644 --- a/rocclr/CMakeLists.txt +++ b/rocclr/CMakeLists.txt @@ -177,7 +177,7 @@ target_include_directories(amdrocclr_static target_compile_definitions(amdrocclr_static PRIVATE BSD_LIBELF) -if(${USE_COMGR_LIBRARY} MATCHES "yes") +if(USE_COMGR_LIBRARY) # FIXME: This should not be part of the public interface. Downstream # users need to add these definitions. This should be defined in a # config header here so other builds don't need to be aware of this. diff --git a/rocclr/device/rocm/CMakeLists.txt b/rocclr/device/rocm/CMakeLists.txt index fe63dbd2f3..455fd7cc6c 100644 --- a/rocclr/device/rocm/CMakeLists.txt +++ b/rocclr/device/rocm/CMakeLists.txt @@ -37,7 +37,7 @@ target_include_directories(oclrocm ${ROCR_INCLUDES}) -if(${USE_COMGR_LIBRARY} MATCHES "yes") +if(USE_COMGR_LIBRARY) target_compile_definitions(oclrocm PRIVATE USE_COMGR_LIBRARY) endif()