mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 17:12:47 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[rocksdb] remove static variables portfile

Browse Source
This commit is contained in:
atkawa7 2017-06-29 13:48:36 -07:00
parent b8bfb0fd90
commit b1461da8c6
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/rocksdb/fix-building-both-static-and-shared.patch
View File

@ -24,7 +24,7 @@ index cbbde8e..cb19649 100644
-add_library(${ROCKSDB_STATIC_LIB} STATIC ${SOURCES})
-target_link_libraries(${ROCKSDB_STATIC_LIB}
+if(BUILD_STATIC_LIBRARY)
+if(NOT BUILD_SHARED_LIBS)
+ add_library(${ROCKSDB_STATIC_LIB} STATIC ${SOURCES})
+ target_link_libraries(${ROCKSDB_STATIC_LIB}
${THIRDPARTY_LIBS} ${SYSTEM_LIBS})

7
ports/rocksdb/portfile.cmake
View File

@ -22,12 +22,6 @@ vcpkg_apply_patches(
)
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
set(BUILD_STATIC_LIBRARY ON)
else()
set(BUILD_STATIC_LIBRARY OFF)
endif()
if(VCPKG_CRT_LINKAGE STREQUAL static)
set(WITH_MD_LIBRARY OFF)
else()
@ -44,7 +38,6 @@ vcpkg_configure_cmake(
-DLZ4=1
-DZLIB=1
-DCURRENT_INSTALLED_DIR=${CURRENT_INSTALLED_DIR}
-DBUILD_STATIC_LIBRARY=${BUILD_STATIC_LIBRARY}
-DFAIL_ON_WARNINGS=OFF
-DWITH_MD_LIBRARY=${WITH_MD_LIBRARY}
OPTIONS_DEBUG