mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 07:29:07 +08:00
9d473a6954
* [boost] Update to 1.70.0 * [boost-build] Update to 1.70.0 * [folly][freeopcua][libtorrent][websocketpp] Upgrades/patches to handle boost 1.70 * [boost-variant] Revert to 1.69 due to regression [fizz][folly] Update and fix for boost 1.70 [libsodium] Use CMake buildsystem replacement to enable non-Windows * [wangle] Update. [folly] Avoid linking debug libs in release. * [pcl] Fix compatibility with boost 1.70 * [fizz] Handle merge regression * [arrow] Modernize and fix cmake targets * [boost-type-traits] Update patches for arm64-windows * [boost-locale] Add boost-system and boost-thread as arm64 dependencies * [ompl] Add missing boost-timer dependency
14 lines
497 B
Diff
14 lines
497 B
Diff
diff --git a/cpp/cmake_modules/BuildUtils.cmake b/cpp/cmake_modules/BuildUtils.cmake
|
|
index 0f014ba..fd2e7b3 100644
|
|
--- a/cpp/cmake_modules/BuildUtils.cmake
|
|
+++ b/cpp/cmake_modules/BuildUtils.cmake
|
|
@@ -289,7 +289,7 @@ function(ADD_ARROW_LIB LIB_NAME)
|
|
target_include_directories(${LIB_NAME}_static PRIVATE ${ARG_PRIVATE_INCLUDES})
|
|
endif()
|
|
|
|
- if(MSVC)
|
|
+ if(MSVC AND 0)
|
|
set(LIB_NAME_STATIC ${LIB_NAME}_static)
|
|
else()
|
|
set(LIB_NAME_STATIC ${LIB_NAME})
|