From 767d56024736250fd509744e0f1ec7d701a161ee Mon Sep 17 00:00:00 2001 From: Daniel Simon Date: Tue, 10 Sep 2024 18:55:23 -0700 Subject: [PATCH 01/15] Update TARGET_FILE to use correct TBB namespace TBB::tbb instead of legacy tbb. --- cpp/tests/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/tests/CMakeLists.txt b/cpp/tests/CMakeLists.txt index 3d58a53ad84..09c7b94a746 100644 --- a/cpp/tests/CMakeLists.txt +++ b/cpp/tests/CMakeLists.txt @@ -56,7 +56,7 @@ if (WIN32) add_custom_command( TARGET tests POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different $ "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$/" + COMMAND ${CMAKE_COMMAND} -E copy_if_different $ "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$/" ) endif() From dd6173de2ece0e1e1bc2ad1bf530e4d42928a321 Mon Sep 17 00:00:00 2001 From: Daniel Simon Date: Wed, 11 Sep 2024 22:32:18 -0700 Subject: [PATCH 02/15] Ensure that curl only gets the -d added when using the visual studio generator. --- 3rdparty/curl/curl.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/curl/curl.cmake b/3rdparty/curl/curl.cmake index c45dbea0dd9..b3b55ef5aa3 100644 --- a/3rdparty/curl/curl.cmake +++ b/3rdparty/curl/curl.cmake @@ -56,7 +56,7 @@ if(BUILD_CURL_FROM_SOURCE) ExternalProject_Get_Property(ext_curl INSTALL_DIR) set(CURL_INCLUDE_DIRS ${INSTALL_DIR}/include/) # "/" is critical. set(CURL_LIB_DIR ${INSTALL_DIR}/${Open3D_INSTALL_LIB_DIR}) - if(MSVC) + if(MSVC AND ${CMAKE_GENERATOR} MATCHES "^Visual Studio.*") set(CURL_LIBRARIES ${curl_lib_name}$<$:-d>) else() set(CURL_LIBRARIES ${curl_lib_name}) From a85e9331b66150aed71a04bad241aeef5d6dce5b Mon Sep 17 00:00:00 2001 From: Daniel Simon Date: Thu, 12 Sep 2024 10:35:26 -0700 Subject: [PATCH 03/15] Make png and curl behave like each other in terms of setting debug library names for the Visual Studio *generator* (not compiler). --- 3rdparty/curl/curl.cmake | 1 + 3rdparty/libpng/libpng.cmake | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/3rdparty/curl/curl.cmake b/3rdparty/curl/curl.cmake index b3b55ef5aa3..b927a89e3bb 100644 --- a/3rdparty/curl/curl.cmake +++ b/3rdparty/curl/curl.cmake @@ -51,6 +51,7 @@ if(BUILD_CURL_FROM_SOURCE) ${ExternalProject_CMAKE_ARGS_hidden} BUILD_BYPRODUCTS /${Open3D_INSTALL_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${curl_lib_name}${CMAKE_STATIC_LIBRARY_SUFFIX} + /${Open3D_INSTALL_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${curl_lib_name}-d${CMAKE_STATIC_LIBRARY_SUFFIX} ) ExternalProject_Get_Property(ext_curl INSTALL_DIR) diff --git a/3rdparty/libpng/libpng.cmake b/3rdparty/libpng/libpng.cmake index 963401f1315..9b8349332b6 100644 --- a/3rdparty/libpng/libpng.cmake +++ b/3rdparty/libpng/libpng.cmake @@ -30,4 +30,8 @@ ExternalProject_Add( ExternalProject_Get_Property(ext_libpng INSTALL_DIR) set(LIBPNG_INCLUDE_DIRS ${INSTALL_DIR}/include/) # "/" is critical. set(LIBPNG_LIB_DIR ${INSTALL_DIR}/${Open3D_INSTALL_LIB_DIR}) -set(LIBPNG_LIBRARIES ${LIBPNG_LIB_NAME}$<$:$<$:d>>) +if(MSVC AND ${CMAKE_GENERATOR} MATCHES "^Visual Studio.*") + set(LIBPNG_LIBRARIES ${LIBPNG_LIB_NAME}$<$:d>) +else() + set(LIBPNG_LIBRARIES ${LIBPNG_LIB_NAME}) +endif() From fc19a9f44b737c9d2fe2b9a748dd298ebe335556 Mon Sep 17 00:00:00 2001 From: Daniel Simon Date: Thu, 12 Sep 2024 11:27:54 -0700 Subject: [PATCH 04/15] Needed to do the same for zlib. --- 3rdparty/zlib/zlib.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/zlib/zlib.cmake b/3rdparty/zlib/zlib.cmake index f0d756b5e75..d56f7431d0b 100644 --- a/3rdparty/zlib/zlib.cmake +++ b/3rdparty/zlib/zlib.cmake @@ -31,7 +31,7 @@ ExternalProject_Add( ExternalProject_Get_Property(ext_zlib INSTALL_DIR) set(ZLIB_INCLUDE_DIRS ${INSTALL_DIR}/include/) # "/" is critical. set(ZLIB_LIB_DIR ${INSTALL_DIR}/lib) -if(MSVC) +if(MSVC AND ${CMAKE_GENERATOR} MATCHES "^Visual Studio.*") set(ZLIB_LIBRARIES ${lib_name}$<$:d>) else() set(ZLIB_LIBRARIES ${lib_name}) From b7df5a0cd7d01de2eea8e33ce8649b1194f58b19 Mon Sep 17 00:00:00 2001 From: Daniel Simon Date: Thu, 12 Sep 2024 11:33:58 -0700 Subject: [PATCH 05/15] Check for visual studio generator for ZeroMQ --- 3rdparty/zeromq/zeromq_build.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/3rdparty/zeromq/zeromq_build.cmake b/3rdparty/zeromq/zeromq_build.cmake index 12d7a6fa9d8..f94d84f2837 100644 --- a/3rdparty/zeromq/zeromq_build.cmake +++ b/3rdparty/zeromq/zeromq_build.cmake @@ -69,7 +69,9 @@ ExternalProject_Add( if(WIN32) # On windows the lib name is more complicated - set(ZEROMQ_LIBRARIES ${lib_name}$<$:gd>${lib_suffix}) + if (${CMAKE_GENERATOR} MATCHES "^Visual Studio.*") + set(ZEROMQ_LIBRARIES ${lib_name}$<$:gd>${lib_suffix}) + endif() # On windows we need to link some additional libs. We will use them # directly as targets in find_dependencies.cmake. From 23ab68ab2ac48be449b212d20ab9c7e5278e4211 Mon Sep 17 00:00:00 2001 From: Daniel Simon Date: Fri, 13 Sep 2024 09:52:22 -0700 Subject: [PATCH 06/15] Updated LibFMT to check for the visual studio generator --- 3rdparty/fmt/fmt.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/3rdparty/fmt/fmt.cmake b/3rdparty/fmt/fmt.cmake index d7698e1a645..fe276019c64 100644 --- a/3rdparty/fmt/fmt.cmake +++ b/3rdparty/fmt/fmt.cmake @@ -39,4 +39,8 @@ ExternalProject_Add( ExternalProject_Get_Property(ext_fmt INSTALL_DIR) set(FMT_INCLUDE_DIRS ${INSTALL_DIR}/include/) # "/" is critical. set(FMT_LIB_DIR ${INSTALL_DIR}/${Open3D_INSTALL_LIB_DIR}) -set(FMT_LIBRARIES ${FMT_LIB_NAME}$<$:$<$:d>>) +if (MSVC AND ${CMAKE_GENERATOR} MATCHES "^Visual Studio.*") + set(FMT_LIBRARIES ${FMT_LIB_NAME}$<$:d>) +else() + set(FMT_LIBRARIES ${FMT_LIB_NAME}) +endif() From 92711f5a00e2d4e4b5c7edfec37a84f5b751075c Mon Sep 17 00:00:00 2001 From: Daniel Simon Date: Fri, 13 Sep 2024 09:54:03 -0700 Subject: [PATCH 07/15] Updated ZeroMQ to check the generator to determine the names. This one seems more suspect than the others... --- 3rdparty/zeromq/zeromq_build.cmake | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/3rdparty/zeromq/zeromq_build.cmake b/3rdparty/zeromq/zeromq_build.cmake index f94d84f2837..0a39746b675 100644 --- a/3rdparty/zeromq/zeromq_build.cmake +++ b/3rdparty/zeromq/zeromq_build.cmake @@ -68,11 +68,6 @@ ExternalProject_Add( ) if(WIN32) - # On windows the lib name is more complicated - if (${CMAKE_GENERATOR} MATCHES "^Visual Studio.*") - set(ZEROMQ_LIBRARIES ${lib_name}$<$:gd>${lib_suffix}) - endif() - # On windows we need to link some additional libs. We will use them # directly as targets in find_dependencies.cmake. # The following code is taken from the zeromq CMakeLists.txt and collects @@ -97,6 +92,9 @@ if(WIN32) if(HAVE_IPHLPAPI) list(APPEND ZEROMQ_ADDITIONAL_LIBS iphlpapi) endif() +endif() +if(MSVC AND ${CMAKE_GENERATOR} MATCHES "^Visual Studio.*") + set(ZEROMQ_LIBRARIES ${lib_name}$<$:gd>${lib_suffix}) else() set(ZEROMQ_LIBRARIES ${lib_name}${lib_suffix}) endif() From 3beaefd5ef4c5c685046a8cac03d88d73657c93d Mon Sep 17 00:00:00 2001 From: Daniel Simon Date: Mon, 16 Sep 2024 09:44:10 -0700 Subject: [PATCH 08/15] Added missing build byproduct for BoringSSL --- 3rdparty/boringssl/boringssl.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/3rdparty/boringssl/boringssl.cmake b/3rdparty/boringssl/boringssl.cmake index 5f9aeea9e33..87930862c98 100644 --- a/3rdparty/boringssl/boringssl.cmake +++ b/3rdparty/boringssl/boringssl.cmake @@ -48,7 +48,9 @@ ExternalProject_Add( CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND "" - BUILD_BYPRODUCTS "" + BUILD_BYPRODUCTS + /$<${WIN32}:$,Debug,Release>/>lib/${CMAKE_STATIC_LIBRARY_PREFIX}ssl${CMAKE_STATIC_LIBRARY_SUFFIX} + /$<${WIN32}:$,Debug,Release>/>lib/${CMAKE_STATIC_LIBRARY_PREFIX}crypto${CMAKE_STATIC_LIBRARY_SUFFIX} ) ExternalProject_Get_Property(ext_boringssl SOURCE_DIR) From 9aeddae9c72c5b0d149c15f07d1d3ec083c570e3 Mon Sep 17 00:00:00 2001 From: Daniel Simon Date: Mon, 16 Sep 2024 09:44:34 -0700 Subject: [PATCH 09/15] Added missing build byproduct for libcurl --- 3rdparty/curl/curl.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/3rdparty/curl/curl.cmake b/3rdparty/curl/curl.cmake index c45dbea0dd9..7a73051c1c0 100644 --- a/3rdparty/curl/curl.cmake +++ b/3rdparty/curl/curl.cmake @@ -51,6 +51,7 @@ if(BUILD_CURL_FROM_SOURCE) ${ExternalProject_CMAKE_ARGS_hidden} BUILD_BYPRODUCTS /${Open3D_INSTALL_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${curl_lib_name}${CMAKE_STATIC_LIBRARY_SUFFIX} + /${Open3D_INSTALL_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${curl_lib_name}-d${CMAKE_STATIC_LIBRARY_SUFFIX} ) ExternalProject_Get_Property(ext_curl INSTALL_DIR) @@ -79,7 +80,9 @@ else() CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND "" - BUILD_BYPRODUCTS "" + BUILD_BYPRODUCTS + /lib/${CMAKE_STATIC_LIBRARY_PREFIX}${curl_lib_name}${CMAKE_STATIC_LIBRARY_SUFFIX} + /lib/${CMAKE_STATIC_LIBRARY_PREFIX}${curl_lib_name}-d${CMAKE_STATIC_LIBRARY_SUFFIX} ) ExternalProject_Get_Property(ext_curl SOURCE_DIR) From 19740dfba29ea2db2436d5d2bd4300a90e8c90e4 Mon Sep 17 00:00:00 2001 From: Daniel Simon Date: Mon, 16 Sep 2024 09:45:15 -0700 Subject: [PATCH 10/15] Added missing build byproduct for ipp --- 3rdparty/ipp/ipp.cmake | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/3rdparty/ipp/ipp.cmake b/3rdparty/ipp/ipp.cmake index ffc9b320512..e4b2b43f2b0 100755 --- a/3rdparty/ipp/ipp.cmake +++ b/3rdparty/ipp/ipp.cmake @@ -35,6 +35,20 @@ else() set(IPP_SUBPATH "") endif() +# Threading layer libs must be linked first. +# https://www.intel.com/content/www/us/en/docs/ipp/developer-guide-reference/2021-11/ipp-performace-benefits-with-tl-functions.html +# Library dependency order: +# https://www.intel.com/content/www/us/en/docs/ipp/developer-guide-reference/2021-11/library-dependencies-by-domain.html +if (WIN32) + set(IPP_LIBRARIES ipp_iw ippcvmt_tl_tbb ippcvmt ippimt_tl_tbb ippimt ippccmt_tl_tbb ippccmt ippsmt ippvmmt ippcoremt_tl_tbb ippcoremt) +else() + set(IPP_LIBRARIES ipp_iw ippcv_tl_tbb ippcv ippi_tl_tbb ippi ippcc_tl_tbb ippcc ipps ippvm ippcore_tl_tbb ippcore) +endif() + +foreach(item IN LISTS IPP_LIBRARIES) + list(APPEND IPP_BUILD_BYPRODUCTS /${IPP_SUBPATH}lib/${item}${CMAKE_STATIC_LIBRARY_SUFFIX}) +endforeach() + ExternalProject_Add(ext_ipp PREFIX ipp URL ${IPP_URL} @@ -45,16 +59,10 @@ ExternalProject_Add(ext_ipp CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND "" - ) + BUILD_BYPRODUCTS + ${IPP_BUILD_BYPRODUCTS} +) + ExternalProject_Get_Property(ext_ipp SOURCE_DIR) set(IPP_INCLUDE_DIR "${SOURCE_DIR}/${IPP_SUBPATH}include/") -# Threading layer libs must be linked first. -# https://www.intel.com/content/www/us/en/docs/ipp/developer-guide-reference/2021-11/ipp-performace-benefits-with-tl-functions.html -# Library dependency order: -# https://www.intel.com/content/www/us/en/docs/ipp/developer-guide-reference/2021-11/library-dependencies-by-domain.html -if (WIN32) - set(IPP_LIBRARIES ipp_iw ippcvmt_tl_tbb ippcvmt ippimt_tl_tbb ippimt ippccmt_tl_tbb ippccmt ippsmt ippvmmt ippcoremt_tl_tbb ippcoremt) -else() - set(IPP_LIBRARIES ipp_iw ippcv_tl_tbb ippcv ippi_tl_tbb ippi ippcc_tl_tbb ippcc ipps ippvm ippcore_tl_tbb ippcore) -endif() set(IPP_LIB_DIR "${SOURCE_DIR}/${IPP_SUBPATH}lib") \ No newline at end of file From f4d452a87c8a017438d9fb503e2036a617f8f900 Mon Sep 17 00:00:00 2001 From: Daniel Simon Date: Mon, 16 Sep 2024 09:45:36 -0700 Subject: [PATCH 11/15] Fixed incorrect build byproduct for UVAtlas --- 3rdparty/uvatlas/uvatlas.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/uvatlas/uvatlas.cmake b/3rdparty/uvatlas/uvatlas.cmake index 51831059941..63642f80e3d 100644 --- a/3rdparty/uvatlas/uvatlas.cmake +++ b/3rdparty/uvatlas/uvatlas.cmake @@ -52,7 +52,7 @@ ExternalProject_Add( -Ddirectxmath_DIR= DEPENDS ext_directxheaders ext_directxmath BUILD_BYPRODUCTS - /${Open3D_INSTALL_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}uvatlas${CMAKE_STATIC_LIBRARY_SUFFIX} + /${Open3D_INSTALL_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}UVAtlas${CMAKE_STATIC_LIBRARY_SUFFIX} ) From cc330c5dbbb5f25b7d68da1d1103ca2fb3fc8dec Mon Sep 17 00:00:00 2001 From: Daniel Simon Date: Mon, 16 Sep 2024 09:46:59 -0700 Subject: [PATCH 12/15] Added missing build byproduct for VTK --- 3rdparty/vtk/vtk_build.cmake | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/3rdparty/vtk/vtk_build.cmake b/3rdparty/vtk/vtk_build.cmake index 271d3789667..905fa52ec6d 100644 --- a/3rdparty/vtk/vtk_build.cmake +++ b/3rdparty/vtk/vtk_build.cmake @@ -26,13 +26,13 @@ set(VTK_LIBRARIES vtksys-${VTK_VERSION}${VTK_LIB_SUFFIX} ) -foreach(item IN LISTS VTK_LIBRARIES) - list(APPEND VTK_BUILD_BYPRODUCTS /${Open3D_INSTALL_LIB_DIR}/${item}${CMAKE_STATIC_LIBRARY_SUFFIX}) -endforeach() - if(BUILD_VTK_FROM_SOURCE) + foreach(item IN LISTS VTK_LIBRARIES) + list(APPEND VTK_BUILD_BYPRODUCTS /${Open3D_INSTALL_LIB_DIR}/${item}${CMAKE_STATIC_LIBRARY_SUFFIX}) + endforeach() + ExternalProject_Add( ext_vtk PREFIX vtk @@ -294,6 +294,10 @@ if(BUILD_VTK_FROM_SOURCE) else() #### download prebuilt vtk + foreach(item IN LISTS VTK_LIBRARIES) + list(APPEND VTK_BUILD_BYPRODUCTS /lib/${item}${CMAKE_STATIC_LIBRARY_SUFFIX}) + endforeach() + if(LINUX_AARCH64) message(FATAL "No precompiled vtk for platform. Enable BUILD_VTK_FROM_SOURCE") elseif(APPLE_AARCH64) @@ -334,7 +338,8 @@ else() #### download prebuilt vtk CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND "" - BUILD_BYPRODUCTS "" + BUILD_BYPRODUCTS + ${VTK_BUILD_BYPRODUCTS} ) ExternalProject_Get_Property(ext_vtk SOURCE_DIR) From 0f4dcfa4f8aaa169ae880c7c5f56e58455c0e04c Mon Sep 17 00:00:00 2001 From: Daniel Simon Date: Mon, 16 Sep 2024 11:53:54 -0700 Subject: [PATCH 13/15] Check for runtime output directory takes multiconfig generators into account --- cpp/tests/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cpp/tests/CMakeLists.txt b/cpp/tests/CMakeLists.txt index 09c7b94a746..d500e3e9b80 100644 --- a/cpp/tests/CMakeLists.txt +++ b/cpp/tests/CMakeLists.txt @@ -53,10 +53,13 @@ open3d_show_and_abort_on_warning(tests) open3d_set_global_properties(tests) # On Windows, running tests from the build folder needs tbb.dll to be in the same folder. if (WIN32) + get_property(IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) + message(STATUS "GENERATOR_IS_MULTI_CONFIG: ${IS_MULTI_CONFIG}") add_custom_command( TARGET tests POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different $ "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$/" + COMMAND echo "RUNTIME_OUTPUT_DIRECTORY: $/$<$:$>" + COMMAND ${CMAKE_COMMAND} -E copy_if_different $ $/$<$:$> ) endif() From 5714a05fa1fb08152979a1347c49f463c30624b6 Mon Sep 17 00:00:00 2001 From: Daniel Simon Date: Mon, 16 Sep 2024 11:52:08 -0700 Subject: [PATCH 14/15] Fixed invalid generator expression on non-windows platforms --- 3rdparty/boringssl/boringssl.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/3rdparty/boringssl/boringssl.cmake b/3rdparty/boringssl/boringssl.cmake index 87930862c98..5048b76648f 100644 --- a/3rdparty/boringssl/boringssl.cmake +++ b/3rdparty/boringssl/boringssl.cmake @@ -49,8 +49,8 @@ ExternalProject_Add( BUILD_COMMAND "" INSTALL_COMMAND "" BUILD_BYPRODUCTS - /$<${WIN32}:$,Debug,Release>/>lib/${CMAKE_STATIC_LIBRARY_PREFIX}ssl${CMAKE_STATIC_LIBRARY_SUFFIX} - /$<${WIN32}:$,Debug,Release>/>lib/${CMAKE_STATIC_LIBRARY_PREFIX}crypto${CMAKE_STATIC_LIBRARY_SUFFIX} + /$<$:$,Debug,Release>/>lib/${CMAKE_STATIC_LIBRARY_PREFIX}ssl${CMAKE_STATIC_LIBRARY_SUFFIX} + /$<$:$,Debug,Release>/>lib/${CMAKE_STATIC_LIBRARY_PREFIX}crypto${CMAKE_STATIC_LIBRARY_SUFFIX} ) ExternalProject_Get_Property(ext_boringssl SOURCE_DIR) From 0f7e43d8f6145c9ea0e88e2e02198c7dd6bebb75 Mon Sep 17 00:00:00 2001 From: Daniel Simon Date: Mon, 16 Sep 2024 20:12:47 -0700 Subject: [PATCH 15/15] Added missing CMAKE_STATIC_LIBRARY_PREFIX --- 3rdparty/ipp/ipp.cmake | 2 +- 3rdparty/vtk/vtk_build.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/3rdparty/ipp/ipp.cmake b/3rdparty/ipp/ipp.cmake index e4b2b43f2b0..deaed2ab179 100755 --- a/3rdparty/ipp/ipp.cmake +++ b/3rdparty/ipp/ipp.cmake @@ -46,7 +46,7 @@ else() endif() foreach(item IN LISTS IPP_LIBRARIES) - list(APPEND IPP_BUILD_BYPRODUCTS /${IPP_SUBPATH}lib/${item}${CMAKE_STATIC_LIBRARY_SUFFIX}) + list(APPEND IPP_BUILD_BYPRODUCTS /${IPP_SUBPATH}lib/${CMAKE_STATIC_LIBRARY_PREFIX}${item}${CMAKE_STATIC_LIBRARY_SUFFIX}) endforeach() ExternalProject_Add(ext_ipp diff --git a/3rdparty/vtk/vtk_build.cmake b/3rdparty/vtk/vtk_build.cmake index 905fa52ec6d..f9217f2301e 100644 --- a/3rdparty/vtk/vtk_build.cmake +++ b/3rdparty/vtk/vtk_build.cmake @@ -30,7 +30,7 @@ set(VTK_LIBRARIES if(BUILD_VTK_FROM_SOURCE) foreach(item IN LISTS VTK_LIBRARIES) - list(APPEND VTK_BUILD_BYPRODUCTS /${Open3D_INSTALL_LIB_DIR}/${item}${CMAKE_STATIC_LIBRARY_SUFFIX}) + list(APPEND VTK_BUILD_BYPRODUCTS /${Open3D_INSTALL_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${item}${CMAKE_STATIC_LIBRARY_SUFFIX}) endforeach() ExternalProject_Add(