[mongo-cxx-driver] fix static build

note:
Actually, static build is perfectly fine but the cmake always build static and dynamic library togather, in the static environment, dynamic build will fail due link error.

I twisted a patch to the CMakeLists.txt to make dynamic build happy when building static.
This commit is contained in:
sdcb 2016-11-22 15:33:24 +08:00
parent 891fe4434c
commit 9d3a91cce2
2 changed files with 54 additions and 6 deletions

View File

@ -0,0 +1,46 @@
diff --git a/src/bsoncxx/CMakeLists.txt b/src/bsoncxx/CMakeLists.txt
index a9a7ada..f4534b1 100644
--- a/src/bsoncxx/CMakeLists.txt
+++ b/src/bsoncxx/CMakeLists.txt
@@ -117,9 +117,15 @@ if (WIN32)
)
endif()
-add_library(bsoncxx SHARED
- ${bsoncxx_sources}
-)
+if(ENABLE_SHARED)
+ add_library(bsoncxx SHARED
+ ${bsoncxx_sources}
+ )
+else()
+ add_library(bsoncxx SHARED
+ exception/error_code.cpp
+ )
+endif()
set(bsoncxx_libs ${LIBBSON_LIBRARIES})
diff --git a/src/mongocxx/CMakeLists.txt b/src/mongocxx/CMakeLists.txt
index 2ef54e4..a2c8ca4 100644
--- a/src/mongocxx/CMakeLists.txt
+++ b/src/mongocxx/CMakeLists.txt
@@ -134,9 +134,15 @@ set_target_properties(mongocxx_mocked PROPERTIES
VERSION ${MONGOCXX_VERSION}
)
-add_library(mongocxx SHARED
- ${mongocxx_sources}
-)
+if(ENABLE_SHARED)
+ add_library(mongocxx SHARED
+ ${mongocxx_sources}
+ )
+else()
+ add_library(mongocxx SHARED
+ exception/error_code.cpp
+ )
+endif()
set_target_properties (mongocxx PROPERTIES
OUTPUT_NAME mongocxx

View File

@ -1,8 +1,3 @@
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(STATUS "Warning: Static building not supported yet. Building dynamic.") #Blocked by build failure
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
include(vcpkg_common_functions) include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mongo-cxx-driver-r3.0.3) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mongo-cxx-driver-r3.0.3)
@ -15,15 +10,22 @@ vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_apply_patches( vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
PATCHES ${CMAKE_CURRENT_LIST_DIR}/disable_test_and_example.patch PATCHES
${CMAKE_CURRENT_LIST_DIR}/disable_test_and_example.patch
${CMAKE_CURRENT_LIST_DIR}/disable_shared.patch
) )
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
set(ENABLE_SHARED ON)
endif()
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
OPTIONS OPTIONS
-DLIBBSON_DIR=${CURRENT_INSTALLED_DIR} -DLIBBSON_DIR=${CURRENT_INSTALLED_DIR}
-DLIBMONGOC_DIR=${CURRENT_INSTALLED_DIR} -DLIBMONGOC_DIR=${CURRENT_INSTALLED_DIR}
-DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=ON -DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=ON
-DENABLE_SHARED=${ENABLE_SHARED}
) )
vcpkg_install_cmake() vcpkg_install_cmake()