From 18bd322d92e5820ad76d09614ea1a2770ef95a97 Mon Sep 17 00:00:00 2001 From: Bora Yalciner Date: Thu, 23 Jan 2025 20:13:54 +0300 Subject: [PATCH 1/2] Fix legacy *.lib files not obeying CMAKE_INSTALL_LIBDIR variable. --- src/tbb/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tbb/CMakeLists.txt b/src/tbb/CMakeLists.txt index 8c84a0b29b..b84facde1c 100644 --- a/src/tbb/CMakeLists.txt +++ b/src/tbb/CMakeLists.txt @@ -163,7 +163,7 @@ if (TBB_INSTALL) # to support previous user experience for linkage. install(FILES $ - DESTINATION lib + DESTINATION ${CMAKE_INSTALL_LIBDIR} CONFIGURATIONS RelWithDebInfo Release MinSizeRel RENAME tbb.lib COMPONENT devel @@ -171,7 +171,7 @@ if (TBB_INSTALL) install(FILES $ - DESTINATION lib + DESTINATION ${CMAKE_INSTALL_LIBDIR} CONFIGURATIONS Debug RENAME tbb_debug.lib COMPONENT devel @@ -180,7 +180,7 @@ if (TBB_INSTALL) if(TBB_LINUX_SEPARATE_DBG) install(FILES $.dbg - DESTINATION lib + DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel ) endif() From cb37178dab7b669ef7c29775c8571bc9434229ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bora=20Yal=C3=A7=C4=B1ner?= Date: Mon, 27 Jan 2025 11:49:02 +0300 Subject: [PATCH 2/2] Fix copyright src/tbb/CMakeLists.txt --- src/tbb/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tbb/CMakeLists.txt b/src/tbb/CMakeLists.txt index b84facde1c..e8bfe2693b 100644 --- a/src/tbb/CMakeLists.txt +++ b/src/tbb/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2020-2024 Intel Corporation +# Copyright (c) 2020-2025 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License.