mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-30 09:29:11 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
70626f098f
vcpkg/ports/mongo-c-driver/fix-arm-build.patch

25 lines
1.4 KiB
Diff
Raw Normal View History

[vcpkg baseline] Fix CI test (#10508) * re-trigger ci test * [kealib] Switch repo to github * [mongo-c-driver] Set icu as a feature * [monkeys-audio] Update version to 5.24 * [mongo-c-driver] Fix arm build * [mongo-c-driver] Re-generate patch * [mongo-c-driver] Remove key word PRIVATE in patch * [llvm] Remove default feature tools * [llvm] Add judgment to install tools * [llvm] Add more condition * [llvm] Fix clang cmake files when selecting feature tools * [halide] Fix build depends info in CONTROL * update baseline
2020-03-26 11:43:02 +08:00
diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt
[libbson/mongo-c-driver] Update to 1.16.1 (#10010) * [libbson/mongo-c-driver] Update to 1.16.1 * [libbson] Refix static build * [mongo-c-driver] Re-fix dependency libbson and dynamic build * [mongo-c-driver] Fix generate cmake file * [mongo-cxx-driver] Fix find libbson * [mongo-c-driver] Fix generate cmake file when building static * [mongo-cxx-driver] Fix dependency mongo-c-driver * update version info * [mongo-c-driver] Update patch * [mongo-c-driver] Re-generate patch. * [mongo-c-driver] Re-generate patch
2020-05-02 03:43:06 +08:00
index 91d97dc..ccebc2a 100644
[vcpkg baseline] Fix CI test (#10508) * re-trigger ci test * [kealib] Switch repo to github * [mongo-c-driver] Set icu as a feature * [monkeys-audio] Update version to 5.24 * [mongo-c-driver] Fix arm build * [mongo-c-driver] Re-generate patch * [mongo-c-driver] Remove key word PRIVATE in patch * [llvm] Remove default feature tools * [llvm] Add judgment to install tools * [llvm] Add more condition * [llvm] Fix clang cmake files when selecting feature tools * [halide] Fix build depends info in CONTROL * update baseline
2020-03-26 11:43:02 +08:00
--- a/src/libmongoc/CMakeLists.txt
+++ b/src/libmongoc/CMakeLists.txt
[libbson/mongo-c-driver] Update to 1.16.1 (#10010) * [libbson/mongo-c-driver] Update to 1.16.1 * [libbson] Refix static build * [mongo-c-driver] Re-fix dependency libbson and dynamic build * [mongo-c-driver] Fix generate cmake file * [mongo-cxx-driver] Fix find libbson * [mongo-c-driver] Fix generate cmake file when building static * [mongo-cxx-driver] Fix dependency mongo-c-driver * update version info * [mongo-c-driver] Update patch * [mongo-c-driver] Re-generate patch. * [mongo-c-driver] Re-generate patch
2020-05-02 03:43:06 +08:00
@@ -698,6 +698,9 @@ if (NOT MONGOC_ENABLE_STATIC)
[vcpkg baseline] Fix CI test (#10508) * re-trigger ci test * [kealib] Switch repo to github * [mongo-c-driver] Set icu as a feature * [monkeys-audio] Update version to 5.24 * [mongo-c-driver] Fix arm build * [mongo-c-driver] Re-generate patch * [mongo-c-driver] Remove key word PRIVATE in patch * [llvm] Remove default feature tools * [llvm] Add judgment to install tools * [llvm] Add more condition * [llvm] Fix clang cmake files when selecting feature tools * [halide] Fix build depends info in CONTROL * update baseline
2020-03-26 11:43:02 +08:00
add_library (mongoc_shared SHARED ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING})
set_target_properties (mongoc_shared PROPERTIES CMAKE_CXX_VISIBILITY_PRESET hidden)
[libbson/mongo-c-driver] Update to 1.16.1 (#10010) * [libbson/mongo-c-driver] Update to 1.16.1 * [libbson] Refix static build * [mongo-c-driver] Re-fix dependency libbson and dynamic build * [mongo-c-driver] Fix generate cmake file * [mongo-cxx-driver] Fix find libbson * [mongo-c-driver] Fix generate cmake file when building static * [mongo-cxx-driver] Fix dependency mongo-c-driver * update version info * [mongo-c-driver] Update patch * [mongo-c-driver] Re-generate patch. * [mongo-c-driver] Re-generate patch
2020-05-02 03:43:06 +08:00
target_link_libraries (mongoc_shared PRIVATE ${LIBRARIES} PUBLIC ${BSON_LIBRARIES})
[vcpkg baseline] Fix CI test (#10508) * re-trigger ci test * [kealib] Switch repo to github * [mongo-c-driver] Set icu as a feature * [monkeys-audio] Update version to 5.24 * [mongo-c-driver] Fix arm build * [mongo-c-driver] Re-generate patch * [mongo-c-driver] Remove key word PRIVATE in patch * [llvm] Remove default feature tools * [llvm] Add judgment to install tools * [llvm] Add more condition * [llvm] Fix clang cmake files when selecting feature tools * [halide] Fix build depends info in CONTROL * update baseline
2020-03-26 11:43:02 +08:00
+if (WIN32)
[libbson/mongo-c-driver] Update to 1.16.1 (#10010) * [libbson/mongo-c-driver] Update to 1.16.1 * [libbson] Refix static build * [mongo-c-driver] Re-fix dependency libbson and dynamic build * [mongo-c-driver] Fix generate cmake file * [mongo-cxx-driver] Fix find libbson * [mongo-c-driver] Fix generate cmake file when building static * [mongo-cxx-driver] Fix dependency mongo-c-driver * update version info * [mongo-c-driver] Update patch * [mongo-c-driver] Re-generate patch. * [mongo-c-driver] Re-generate patch
2020-05-02 03:43:06 +08:00
+ target_link_libraries (mongoc_shared PRIVATE Advapi32)
[vcpkg baseline] Fix CI test (#10508) * re-trigger ci test * [kealib] Switch repo to github * [mongo-c-driver] Set icu as a feature * [monkeys-audio] Update version to 5.24 * [mongo-c-driver] Fix arm build * [mongo-c-driver] Re-generate patch * [mongo-c-driver] Remove key word PRIVATE in patch * [llvm] Remove default feature tools * [llvm] Add judgment to install tools * [llvm] Add more condition * [llvm] Fix clang cmake files when selecting feature tools * [halide] Fix build depends info in CONTROL * update baseline
2020-03-26 11:43:02 +08:00
+endif()
[libbson/mongo-c-driver] Update to 1.16.1 (#10010) * [libbson/mongo-c-driver] Update to 1.16.1 * [libbson] Refix static build * [mongo-c-driver] Re-fix dependency libbson and dynamic build * [mongo-c-driver] Fix generate cmake file * [mongo-cxx-driver] Fix find libbson * [mongo-c-driver] Fix generate cmake file when building static * [mongo-cxx-driver] Fix dependency mongo-c-driver * update version info * [mongo-c-driver] Update patch * [mongo-c-driver] Re-generate patch. * [mongo-c-driver] Re-generate patch
2020-05-02 03:43:06 +08:00
target_include_directories (mongoc_shared BEFORE PUBLIC ${MONGOC_INTERNAL_INCLUDE_DIRS})
target_include_directories (mongoc_shared PRIVATE ${PRIVATE_ZLIB_INCLUDES})
target_include_directories (mongoc_shared PRIVATE ${LIBMONGOCRYPT_INCLUDE_DIRECTORIES})
@@ -710,6 +713,9 @@ set_target_properties (mongoc_shared PROPERTIES OUTPUT_NAME "${MONGOC_OUTPUT_BAS
else ()
[vcpkg baseline] Fix CI test (#10508) * re-trigger ci test * [kealib] Switch repo to github * [mongo-c-driver] Set icu as a feature * [monkeys-audio] Update version to 5.24 * [mongo-c-driver] Fix arm build * [mongo-c-driver] Re-generate patch * [mongo-c-driver] Remove key word PRIVATE in patch * [llvm] Remove default feature tools * [llvm] Add judgment to install tools * [llvm] Add more condition * [llvm] Fix clang cmake files when selecting feature tools * [halide] Fix build depends info in CONTROL * update baseline
2020-03-26 11:43:02 +08:00
add_library (mongoc_static STATIC ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING})
[libbson/mongo-c-driver] Update to 1.16.1 (#10010) * [libbson/mongo-c-driver] Update to 1.16.1 * [libbson] Refix static build * [mongo-c-driver] Re-fix dependency libbson and dynamic build * [mongo-c-driver] Fix generate cmake file * [mongo-cxx-driver] Fix find libbson * [mongo-c-driver] Fix generate cmake file when building static * [mongo-cxx-driver] Fix dependency mongo-c-driver * update version info * [mongo-c-driver] Update patch * [mongo-c-driver] Re-generate patch. * [mongo-c-driver] Re-generate patch
2020-05-02 03:43:06 +08:00
target_link_libraries (mongoc_static ${STATIC_LIBRARIES} ${BSON_LIBRARIES})
+ if (WIN32)
[vcpkg baseline] Fix CI test (#10508) * re-trigger ci test * [kealib] Switch repo to github * [mongo-c-driver] Set icu as a feature * [monkeys-audio] Update version to 5.24 * [mongo-c-driver] Fix arm build * [mongo-c-driver] Re-generate patch * [mongo-c-driver] Remove key word PRIVATE in patch * [llvm] Remove default feature tools * [llvm] Add judgment to install tools * [llvm] Add more condition * [llvm] Fix clang cmake files when selecting feature tools * [halide] Fix build depends info in CONTROL * update baseline
2020-03-26 11:43:02 +08:00
+ target_link_libraries (mongoc_static Advapi32)
+ endif()
[libbson/mongo-c-driver] Update to 1.16.1 (#10010) * [libbson/mongo-c-driver] Update to 1.16.1 * [libbson] Refix static build * [mongo-c-driver] Re-fix dependency libbson and dynamic build * [mongo-c-driver] Fix generate cmake file * [mongo-cxx-driver] Fix find libbson * [mongo-c-driver] Fix generate cmake file when building static * [mongo-cxx-driver] Fix dependency mongo-c-driver * update version info * [mongo-c-driver] Update patch * [mongo-c-driver] Re-generate patch. * [mongo-c-driver] Re-generate patch
2020-05-02 03:43:06 +08:00
target_include_directories (mongoc_static BEFORE PUBLIC ${MONGOC_INTERNAL_INCLUDE_DIRS})
target_include_directories (mongoc_static PRIVATE ${PRIVATE_ZLIB_INCLUDES})
target_include_directories (mongoc_static PRIVATE ${LIBMONGOCRYPT_INCLUDE_DIRECTORIES})
Reference in New Issue Copy Permalink