ittnotify: use untouched library

Author: clementperon

CMakeLists.txt

@@ -240,6 +240,7 @@ if (TBB_FIND_PACKAGE AND TBB_DIR)
     find_package(TBB REQUIRED)
 else()
     if (TBB_BUILD)
+        add_subdirectory(src/ittapi)
         add_subdirectory(src/tbb)
     endif()
     if (TBBMALLOC_BUILD)

src/ittapi/CMakeLists.txt

@@ -0,0 +1,21 @@
+include(FetchContent)
+
+# Fetch the ittapi library if it doesn't exist
+if(NOT TARGET ittapi::ittnotify)
+        FetchContent_Declare(
+                ittapi
+                # https://github.com/intel/ittapi/archive/refs/tags/v3.25.1.tar.gz
+                URL ${CMAKE_CURRENT_SOURCE_DIR}/ittapi-3.25.1.tar.gz
+                URL_HASH
+                        SHA256=866a5a75a287a7440760146f99bd1093750c3fb5bf572c3bff2d4795628ebc7c
+        )
+        FetchContent_MakeAvailable(ittapi)
+        add_library(ittapi::ittnotify ALIAS ittnotify)
+endif()
+
+if(NOT TARGET ittapi::ittnotify)
+        message(
+                ERROR
+                "Failed to add Intel® Instrumentation and Tracing Technology (ITT) library"
+        )
+endif()

src/ittapi/ittapi-3.25.1.tar.gz

@@ -121,6 +121,7 @@ endif()
 
 target_link_libraries(tbb
     PRIVATE
+    ittapi::ittnotify
     Threads::Threads
     ${TBB_LIB_LINK_LIBS}
     ${TBB_COMMON_LINK_LIBS}

src/tbb/CMakeLists.txt

@@ -40,15 +40,14 @@ extern "C" void MallocInitializeITT();
 #error This file is expected to be used for either TBB or TBB allocator build.
 #endif // __TBB_BUILD
 
-#include "tools_api/ittnotify_static.c"
-
 namespace tbb {
 namespace detail {
 namespace r1 {
 
 /** This extra proxy method is necessary since __itt_init_lib is declared as static **/
 int __TBB_load_ittnotify() {
 #if !(_WIN32||_WIN64)
+    #include <dlfcn.h>
     // tool_api crashes without dlopen, check that it's present. Common case
     // for lack of dlopen is static binaries, i.e. ones build with -static.
     if (dlopen == nullptr)

src/tbb/itt_notify.cpp

@@ -31,8 +31,8 @@
 #define INTEL_ITTNOTIFY_API_PRIVATE
 #endif
 
-#include "tools_api/ittnotify.h"
-#include "tools_api/legacy/ittnotify.h"
+#include "ittnotify.h"
+#include "legacy/ittnotify.h"
 extern "C" void __itt_fini_ittlib(void);
 extern "C" void __itt_release_resources(void);