Skip to content

Commit bfca3ca

Browse files
authored
Use cp -rp to copy tbb libs to avoid relinking every time running make (#7155)
1 parent 5574c0f commit bfca3ca

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

3rdparty/ipp/ipp.cmake

+6-2
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,16 @@ if(APPLE AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL x86_64)
1717
set(IPP_VERSION_INT 20210901)
1818
set(IPP_URL "https://github.com/isl-org/open3d_downloads/releases/download/mkl-static-2024.1/ipp_static-2021.9.1-macosx_10_15_x86_64.tar.xz")
1919
set(IPP_HASH "f27e45da604a1f6d1d2a747a0f67ffafeaff084b0f860a963d8c3996e2f40bb3")
20+
set(COPY_TBB_COMMAND cp -rp)
2021
elseif(WIN32 AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL AMD64)
2122
set(IPP_URL "https://github.com/isl-org/open3d_downloads/releases/download/mkl-static-2024.1/ipp_static-2021.11.0-win_amd64.zip")
2223
set(IPP_HASH "69e8a7dc891609de6fea478a67659d2f874d12b51a47bd2e3e5a7c4c473c53a6")
24+
cmake_minimum_required(VERSION 3.26) # for copy_directory_if_different
25+
set(COPY_TBB_COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different)
2326
elseif(UNIX AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL x86_64)
2427
set(IPP_URL "https://github.com/isl-org/open3d_downloads/releases/download/mkl-static-2024.1/ipp_static-2021.11.0-linux_x86_64.tar.xz")
2528
set(IPP_HASH "51f33fd5bf5011e9eae0e034e5cc70a7c0ac0ba93d6a3f66fd7e145cf1a5e30b")
29+
set(COPY_TBB_COMMAND cp -rp)
2630
else()
2731
set(WITH_IPP OFF)
2832
message(FATAL_ERROR "Intel IPP disabled: Unsupported Platform.")
@@ -55,7 +59,7 @@ ExternalProject_Add(ext_ipp
5559
URL_HASH SHA256=${IPP_HASH}
5660
DOWNLOAD_DIR "${OPEN3D_THIRD_PARTY_DOWNLOAD_DIR}/ipp"
5761
# Copy all libs from lib/tl/tbb to lib/ since Open3D cmake scripts only support one LIB_DIR per dependency
58-
UPDATE_COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/${IPP_SUBPATH}lib/tl/tbb/ <SOURCE_DIR>/${IPP_SUBPATH}lib/
62+
UPDATE_COMMAND ${COPY_TBB_COMMAND} <SOURCE_DIR>/${IPP_SUBPATH}lib/tl/tbb/. <SOURCE_DIR>/${IPP_SUBPATH}lib/
5963
CONFIGURE_COMMAND ""
6064
BUILD_COMMAND ""
6165
INSTALL_COMMAND ""
@@ -65,4 +69,4 @@ ExternalProject_Add(ext_ipp
6569

6670
ExternalProject_Get_Property(ext_ipp SOURCE_DIR)
6771
set(IPP_INCLUDE_DIR "${SOURCE_DIR}/${IPP_SUBPATH}include/")
68-
set(IPP_LIB_DIR "${SOURCE_DIR}/${IPP_SUBPATH}lib")
72+
set(IPP_LIB_DIR "${SOURCE_DIR}/${IPP_SUBPATH}lib")

0 commit comments

Comments
 (0)