From ff922a013e54e78a5503cbcacc2daadae47b114c Mon Sep 17 00:00:00 2001 From: Matt Arsenault Date: Tue, 12 May 2020 14:59:20 -0400 Subject: [PATCH] Use standard cmake option for USE_COMGR_LIBRARY Change-Id: Id94d88a33772d9c9ab28f9a82c6f761d9c867476 [ROCm/clr commit: 0c539737cf8cf473914a7cf745d65c7ee28a758a] --- projects/clr/rocclr/CMakeLists.txt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/projects/clr/rocclr/CMakeLists.txt b/projects/clr/rocclr/CMakeLists.txt index 2ed0d36c3f..152b28a2ba 100644 --- a/projects/clr/rocclr/CMakeLists.txt +++ b/projects/clr/rocclr/CMakeLists.txt @@ -29,8 +29,16 @@ write_basic_package_version_file("${ROCCLR_VERSION_PATH}" set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") -# FIXME: Should be option and ON/OFF, not yes/no variable. -set(USE_COMGR_LIBRARY "yes") +# FIXME: Handling legacy custom boolean matching "yes" or "no" +if(DEFINED USE_COMGR_LIBRARY) + if(${USE_COMGR_LIBRARY} MATCHES "yes") + set(USE_COMGR_LIBRARY ON) + elseif(${USE_COMGR_LIBRARY} MATCHES "no") + set(USE_COMGR_LIBRARY OFF) + endif() +endif() + +option(USE_COMGR_LIBRARY "Use comgr library" ON) if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") add_compile_options("-Wno-ignored-attributes")