From: Igor Kulaychuk Date: Mon, 4 Jun 2018 17:49:43 +0000 (+0300) Subject: Enable better search for CoreCLR bin directory X-Git-Tag: submit/tizen/20180620.071641~2^2~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bb779a57c87e8d97626b8f5acf6c1f34ed014d0b;p=sdk%2Ftools%2Fnetcoredbg.git Enable better search for CoreCLR bin directory --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 6127c28..6e611ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,6 +21,8 @@ if (NOT IS_DIRECTORY "${CLR_DIR}") message(FATAL_ERROR "Unable to find CoreCLR directory") endif() +set(CLR_CONFIGURATION_TYPES "Debug;Checked;Release;RelWithDebInfo" CACHE STRING "") + if ("${CLR_BIN_DIR}" STREQUAL "") if (CMAKE_SYSTEM_NAME STREQUAL Darwin) set(TARGET_OS_NAME "OSX") @@ -28,17 +30,14 @@ if ("${CLR_BIN_DIR}" STREQUAL "") set(TARGET_OS_NAME "Linux") endif() - set(CMAKE_CONFIGURATION_TYPES "Debug;Checked;Release;RelWithDebInfo") - # TODO: Search for CMAKE_BUILD_TYPE configuration first # TODO: CLR_CMAKE_TARGET_ARCH may be armel - set(CLR_BIN_DIR ${CLR_DIR}/bin/Product/${TARGET_OS_NAME}.${CLR_CMAKE_TARGET_ARCH}.Debug) - if (NOT IS_DIRECTORY "${CLR_BIN_DIR}") - set(CLR_BIN_DIR ${CLR_DIR}/bin/Product/${TARGET_OS_NAME}.${CLR_CMAKE_TARGET_ARCH}.Release) - endif() - if (NOT IS_DIRECTORY "${CLR_BIN_DIR}") - set(CLR_BIN_DIR ${CLR_DIR}/bin/Product/${TARGET_OS_NAME}.${CLR_CMAKE_TARGET_ARCH}.Checked) - endif() + foreach(CONFIG IN LISTS CLR_CONFIGURATION_TYPES) + set(CLR_BIN_DIR ${CLR_DIR}/bin/Product/${TARGET_OS_NAME}.${CLR_CMAKE_TARGET_ARCH}.${CONFIG}) + if (IS_DIRECTORY "${CLR_BIN_DIR}") + break() + endif() + endforeach() if (IS_DIRECTORY "${CLR_BIN_DIR}") message(STATUS "CoreCLR bin directory: " ${CLR_BIN_DIR})