mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 19:25:27 +08:00
e20e1c7908
* Use expressive patch name * Fix BROTLI_INCLUDE_DIR import * glog is unused (off by default) * Cleanup portfile, fix 'arrow[core]' * Add CI test port * Update to 8.0.1 [skip actions] * Declare dependency source for substituted packages * Trim obsolete patch chunks * Fix static link libs export * Use substituted targets directly, for proper export * Fix snappy lib export to pc file * Update versions * Add license for test port * Add =pass entries for the new "vcpkg-ci-Xxx" port. Co-authored-by: Billy O'Neal <bion@microsoft.com>
14 lines
508 B
Diff
14 lines
508 B
Diff
diff --git a/cpp/cmake_modules/BuildUtils.cmake b/cpp/cmake_modules/BuildUtils.cmake
|
|
index 391c43e0a..50f6d3d3c 100644
|
|
--- a/cpp/cmake_modules/BuildUtils.cmake
|
|
+++ b/cpp/cmake_modules/BuildUtils.cmake
|
|
@@ -427,7 +427,7 @@ function(ADD_ARROW_LIB LIB_NAME)
|
|
target_include_directories(${LIB_NAME}_static PRIVATE ${ARG_PRIVATE_INCLUDES})
|
|
endif()
|
|
|
|
- if(MSVC_TOOLCHAIN)
|
|
+ if(MSVC_TOOLCHAIN AND 0)
|
|
set(LIB_NAME_STATIC ${LIB_NAME}_static)
|
|
else()
|
|
set(LIB_NAME_STATIC ${LIB_NAME})
|