mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-27 04:12:19 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #3013 from yurybura/master

Browse Source 
[rocksdb] Fix build and use debug suffix 'd'
This commit is contained in:
Alexander Karatarakis 2018-03-12 15:03:50 -07:00 committed by GitHub
commit 990a5d71bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/benchmark/CONTROL
View File

@ -1,3 +1,3 @@
Source: benchmark
Version: 1.3.0
Version: 1.3.0-1
Description: A library to support the benchmarking of functions, similar to unit-tests.

1
ports/benchmark/portfile.cmake
View File

@ -26,6 +26,7 @@ vcpkg_configure_cmake(
PREFER_NINJA
OPTIONS
-DBENCHMARK_ENABLE_TESTING=OFF
-DCMAKE_DEBUG_POSTFIX=d
)
vcpkg_install_cmake()

2
ports/gflags/CONTROL
View File

@ -1,3 +1,3 @@
Source: gflags
Version: 2.2.1-2
Version: 2.2.1-3
Description: A C++ library that implements commandline flags processing

1
ports/gflags/portfile.cmake
View File

@ -25,6 +25,7 @@ vcpkg_configure_cmake(
-DGFLAGS_REGISTER_BUILD_DIR:BOOL=OFF
-DGFLAGS_REGISTER_INSTALL_PREFIX:BOOL=OFF
-DBUILD_gflags_nothreads_LIB:BOOL=OFF
-DCMAKE_DEBUG_POSTFIX=d
)
vcpkg_install_cmake()

2
ports/gtest/CONTROL
View File

@ -1,3 +1,3 @@
Source: gtest
Version: 1.8.0-6
Version: 1.8.0-7
Description: GoogleTest and GoogleMock testing frameworks.

21
ports/gtest/portfile.cmake
View File

@ -25,6 +25,7 @@ vcpkg_configure_cmake(
OPTIONS
-DBUILD_GMOCK=ON
-DBUILD_GTEST=ON
-DCMAKE_DEBUG_POSTFIX=d
-Dgtest_force_shared_crt=${GTEST_FORCE_SHARED_CRT}
)
@ -60,12 +61,12 @@ if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/gtest.dll)
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gmock.dll ${CURRENT_PACKAGES_DIR}/bin/gmock.dll)
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gmock_main.dll ${CURRENT_PACKAGES_DIR}/bin/gmock_main.dll)
endif()
if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/gtest.dll)
if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/gtestd.dll)
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin/)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gtest.dll ${CURRENT_PACKAGES_DIR}/debug/bin/gtest.dll)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gtest_main.dll ${CURRENT_PACKAGES_DIR}/debug/bin/gtest_main.dll)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gmock.dll ${CURRENT_PACKAGES_DIR}/debug/bin/gmock.dll)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gmock_main.dll ${CURRENT_PACKAGES_DIR}/debug/bin/gmock_main.dll)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gtestd.dll ${CURRENT_PACKAGES_DIR}/debug/bin/gtestd.dll)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gtest_maind.dll ${CURRENT_PACKAGES_DIR}/debug/bin/gtest_maind.dll)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gmockd.dll ${CURRENT_PACKAGES_DIR}/debug/bin/gmockd.dll)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gmock_maind.dll ${CURRENT_PACKAGES_DIR}/debug/bin/gmock_maind.dll)
endif()
if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/gtest.lib)
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link)
@ -74,12 +75,12 @@ if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/gtest.lib)
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gmock.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/gmock.lib)
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gmock_main.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/gmock_main.lib)
endif()
if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/gtest.lib)
if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/gtestd.lib)
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gtest.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/gtestd.lib)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gtest_main.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/gtest_maind.lib)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gmock.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/gmockd.lib)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gmock_main.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/gmock_maind.lib)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gtestd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/gtestd.lib)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gtest_maind.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/gtest_maind.lib)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gmockd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/gmockd.lib)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gmock_maind.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/gmock_maind.lib)
endif()
vcpkg_copy_pdbs()

2
ports/lz4/CONTROL
View File

@ -1,3 +1,3 @@
Source: lz4
Version: 1.8.1.2
Version: 1.8.1.2-1
Description: Lossless compression algorithm, providing compression speed at 400 MB/s per core.

3
ports/lz4/portfile.cmake
View File

@ -12,7 +12,8 @@ vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS_DEBUG
-DLZ4_SKIP_INCLUDES=ON)
-DLZ4_SKIP_INCLUDES=ON
-DCMAKE_DEBUG_POSTFIX=d)
vcpkg_install_cmake()
vcpkg_copy_pdbs()

8
ports/rocksdb/0001-third-party.patch
View File

@ -21,8 +21,8 @@ index a364d1d..1d85d50 100644
-set(GFLAGS_LIB_RELEASE ${GFLAGS_HOME}/bin/retail/amd64/gflags.lib)
+set(GFLAGS_HOME ${CURRENT_INSTALLED_DIR})
+set(GFLAGS_INCLUDE ${GFLAGS_HOME}/include)
+find_library(GFLAGS_LIB_DEBUG NAMES gflags gflags_static)
+set(GFLAGS_LIB_RELEASE ${GFLAGS_LIB_DEBUG})
+set(GFLAGS_LIB_DEBUG ${GFLAGS_HOME}/debug/lib/gflagsd.lib)
+set(GFLAGS_LIB_RELEASE ${GFLAGS_HOME}/lib/gflags.lib)
# ================================================== GFLAGS ==================================================
#
@ -36,7 +36,7 @@ index a364d1d..1d85d50 100644
-set(SNAPPY_LIB_RELEASE ${SNAPPY_HOME}/bin/retail/amd64/snappy.lib)
+set(SNAPPY_HOME ${CURRENT_INSTALLED_DIR})
+set(SNAPPY_INCLUDE ${SNAPPY_HOME}/include)
+set(SNAPPY_LIB_DEBUG ${SNAPPY_HOME}/debug/lib/snappy.lib)
+set(SNAPPY_LIB_DEBUG ${SNAPPY_HOME}/debug/lib/snappyd.lib)
+set(SNAPPY_LIB_RELEASE ${SNAPPY_HOME}/lib/snappy.lib)
#
@ -51,7 +51,7 @@ index a364d1d..1d85d50 100644
-set(LZ4_LIB_RELEASE ${LZ4_HOME}/bin/retail/amd64/lz4.lib)
+set(LZ4_HOME ${CURRENT_INSTALLED_DIR})
+set(LZ4_INCLUDE ${LZ4_HOME}/include)
+set(LZ4_LIB_DEBUG ${LZ4_HOME}/debug/lib/lz4.lib)
+set(LZ4_LIB_DEBUG ${LZ4_HOME}/debug/lib/lz4d.lib)
+set(LZ4_LIB_RELEASE ${LZ4_HOME}/lib/lz4.lib)
#

4
ports/rocksdb/CONTROL
View File

@ -1,4 +1,4 @@
Source: rocksdb
Version: 5.10.4-1
Version: 5.10.4-2
Description: A library that provides an embeddable, persistent key-value store for fast storage
Build-Depends: snappy, lz4, zlib, gtest
Build-Depends: snappy, gflags, lz4, zlib

8
ports/rocksdb/portfile.cmake
View File

@ -1,9 +1,5 @@
include(vcpkg_common_functions)
if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
message(FATAL_ERROR "Rocksdb only supports x64")
endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/rocksdb
@ -41,9 +37,11 @@ vcpkg_configure_cmake(
-DROCKSDB_INSTALL_ON_WINDOWS=ON
-DFAIL_ON_WARNINGS=OFF
-DWITH_MD_LIBRARY=${WITH_MD_LIBRARY}
-DPORTABLE=ON
-DCMAKE_DEBUG_POSTFIX=d
-DROCKSDB_DISABLE_INSTALL_SHARED_LIB=${ROCKSDB_DISABLE_INSTALL_SHARED_LIB}
-DROCKSDB_DISABLE_INSTALL_STATIC_LIB=${ROCKSDB_DISABLE_INSTALL_STATIC_LIB}
-DROCKSDB_VERSION=5.10.3
-DROCKSDB_VERSION=5.10.4
-DCURRENT_INSTALLED_DIR=${CURRENT_INSTALLED_DIR}
-DCMAKE_DISABLE_FIND_PACKAGE_TBB=TRUE
-DCMAKE_DISABLE_FIND_PACKAGE_NUMA=TRUE

2
ports/snappy/CONTROL
View File

@ -1,3 +1,3 @@
Source: snappy
Version: 1.1.7-1
Version: 1.1.7-2
Description: A fast compressor/decompressor.

3
ports/snappy/portfile.cmake
View File

@ -12,7 +12,8 @@ vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DSNAPPY_BUILD_TESTS=OFF)
-DSNAPPY_BUILD_TESTS=OFF
-DCMAKE_DEBUG_POSTFIX=d)
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Snappy)