From 0995620f995e0192eee42ef5fe5a11b3467732d0 Mon Sep 17 00:00:00 2001 From: Zentrik Date: Wed, 9 Oct 2024 20:35:17 +0100 Subject: [PATCH] Rebase [ittapi] Check out branch only if ITTAPI is cloned --- .../IntelJITProfiling/CMakeLists.txt | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/llvm/lib/ExecutionEngine/IntelJITProfiling/CMakeLists.txt b/llvm/lib/ExecutionEngine/IntelJITProfiling/CMakeLists.txt index 0aedadc65df05..bb2e3e2ebcb4c 100644 --- a/llvm/lib/ExecutionEngine/IntelJITProfiling/CMakeLists.txt +++ b/llvm/lib/ExecutionEngine/IntelJITProfiling/CMakeLists.txt @@ -12,23 +12,22 @@ if(NOT DEFINED ITTAPI_SOURCE_DIR) set(ITTAPI_SOURCE_DIR ${PROJECT_BINARY_DIR}) endif() -if(NOT EXISTS ${ITTAPI_SOURCE_DIR}/ittapi) - execute_process(COMMAND ${GIT_EXECUTABLE} clone ${ITTAPI_GIT_REPOSITORY} - WORKING_DIRECTORY ${ITTAPI_SOURCE_DIR} +if(NOT EXISTS ${ITTAPI_SOURCE_DIR}) + execute_process(COMMAND ${GIT_EXECUTABLE} clone ${ITTAPI_GIT_REPOSITORY} ${ITTAPI_SOURCE_DIR} + WORKING_DIRECTORY ${ITTAPI_SOURCE_DIR}/.. RESULT_VARIABLE GIT_CLONE_RESULT) if(NOT GIT_CLONE_RESULT EQUAL "0") message(FATAL_ERROR "git clone ${ITTAPI_GIT_REPOSITORY} failed with ${GIT_CLONE_RESULT}, please clone ${ITTAPI_GIT_REPOSITORY}") endif() + execute_process(COMMAND ${GIT_EXECUTABLE} checkout ${ITTAPI_GIT_TAG} + WORKING_DIRECTORY ${ITTAPI_SOURCE_DIR} + RESULT_VARIABLE GIT_CHECKOUT_RESULT) + if(NOT GIT_CHECKOUT_RESULT EQUAL "0") + message(FATAL_ERROR "git checkout ${ITTAPI_GIT_TAG} failed with ${GIT_CHECKOUT_RESULT}, please checkout ${ITTAPI_GIT_TAG} at ${ITTAPI_SOURCE_DIR}") + endif() endif() -execute_process(COMMAND ${GIT_EXECUTABLE} checkout ${ITTAPI_GIT_TAG} - WORKING_DIRECTORY ${ITTAPI_SOURCE_DIR}/ittapi - RESULT_VARIABLE GIT_CHECKOUT_RESULT) -if(NOT GIT_CHECKOUT_RESULT EQUAL "0") - message(FATAL_ERROR "git checkout ${ITTAPI_GIT_TAG} failed with ${GIT_CHECKOUT_RESULT}, please checkout ${ITTAPI_GIT_TAG} at ${ITTAPI_SOURCE_DIR}/ittapi") -endif() - -include_directories( ${ITTAPI_SOURCE_DIR}/ittapi/include/ ) +include_directories( ${ITTAPI_SOURCE_DIR}/include/ ) if( HAVE_LIBDL ) set(LLVM_INTEL_JIT_LIBS ${CMAKE_DL_LIBS}) @@ -39,7 +38,7 @@ set(LLVM_INTEL_JIT_LIBS ${LLVM_PTHREAD_LIB} ${LLVM_INTEL_JIT_LIBS}) add_llvm_component_library(LLVMIntelJITProfiling jitprofiling.c - ${ITTAPI_SOURCE_DIR}/ittapi/src/ittnotify/ittnotify_static.c + ${ITTAPI_SOURCE_DIR}/src/ittnotify/ittnotify_static.c LINK_LIBS ${LLVM_INTEL_JIT_LIBS}