From 8e565932e655767f93e45aa71887d1f633d1aa6e Mon Sep 17 00:00:00 2001 From: Zentrik Date: Sun, 1 Sep 2024 22:25:09 +0100 Subject: [PATCH] Use correct ittapi source directory ITTAPI_SOURCE_DIR is what IntelJITProfiling uses, so I presume this is what should be used here. This fixes building for me as I set `ITTAPI_SOURCE_DIR`. Fix if ITTAPI_SOURCE_DIR is not set Fix IntelJITEvents ase well --- llvm/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt | 5 ++++- llvm/lib/ExecutionEngine/Orc/TargetProcess/CMakeLists.txt | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/llvm/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt b/llvm/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt index b4fd04d65e263..56c529c08937c 100644 --- a/llvm/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt +++ b/llvm/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt @@ -1,5 +1,8 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ) -include_directories( ${PROJECT_BINARY_DIR}/ittapi/include/ ) +if(NOT DEFINED ITTAPI_SOURCE_DIR) + set(ITTAPI_SOURCE_DIR ${PROJECT_BINARY_DIR}) +endif() +include_directories( ${ITTAPI_SOURCE_DIR}/ittapi/include/ ) add_llvm_component_library(LLVMIntelJITEvents IntelJITEventListener.cpp diff --git a/llvm/lib/ExecutionEngine/Orc/TargetProcess/CMakeLists.txt b/llvm/lib/ExecutionEngine/Orc/TargetProcess/CMakeLists.txt index 3d1dfe758c79d..03677d610cbb7 100644 --- a/llvm/lib/ExecutionEngine/Orc/TargetProcess/CMakeLists.txt +++ b/llvm/lib/ExecutionEngine/Orc/TargetProcess/CMakeLists.txt @@ -6,7 +6,10 @@ set(intel_jit_profiling ) if( LLVM_USE_INTEL_JITEVENTS ) set(intel_jit_profiling IntelJITProfiling) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../IntelJITProfiling) - include_directories(${PROJECT_BINARY_DIR}/ittapi/include/ ) + if(NOT DEFINED ITTAPI_SOURCE_DIR) + set(ITTAPI_SOURCE_DIR ${PROJECT_BINARY_DIR}) + endif() + include_directories(${ITTAPI_SOURCE_DIR}/ittapi/include/ ) endif() add_llvm_component_library(LLVMOrcTargetProcess