From 16bc1d5519bce71a5a39d82fac585e77044dd514 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Fri, 10 Jun 2016 14:09:48 +0200 Subject: [PATCH 1/2] Add include path to config specific opensslcnf.h --- cmake/FindOpenSSL.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmake/FindOpenSSL.cmake b/cmake/FindOpenSSL.cmake index aef9fa32c8..447c277ae6 100644 --- a/cmake/FindOpenSSL.cmake +++ b/cmake/FindOpenSSL.cmake @@ -73,7 +73,8 @@ endif() if (WIN32) # 32-bit not officially supported anymore anyway set(SSL_BITS "x64") - set(SSL_NUGET_TARGET "Release/target") # there also is Debug if you want to... + set(SSL_NUGET_RELEASE "Release") # there also is Debug if you want to... + set(SSL_NUGET_TARGET "${SSL_NUGET_RELEASE}/target") # v140 corresponds to VS 2015 # dynamic dll openssl looks like that... #set(SSL_NUGET_DIR "lib/native/v140/windesktop/msvcstl/dyn/rt-dyn") @@ -543,3 +544,7 @@ endif() if(OPENSSL_USE_STATIC_LIBS) set(CMAKE_FIND_LIBRARY_SUFFIXES ${_openssl_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) endif() + +if (OPENSSL_ROOT_DIR AND SSL_NUGET) + set(OPENSSL_INCLUDE_DIR "${OPENSSL_INCLUDE_DIR};${OPENSSL_INCLUDE_DIR}/v140/${SSL_BITS}/${SSL_NUGET_RELEASE}/static/") +endif() \ No newline at end of file From 6a74033eb3a04c7dcda55c46749ccf2fdd34a679 Mon Sep 17 00:00:00 2001 From: hkernbach Date: Fri, 10 Jun 2016 14:20:44 +0200 Subject: [PATCH 2/2] _frontend collection permission --- js/server/upgrade-database.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/server/upgrade-database.js b/js/server/upgrade-database.js index d67a1c1e8b..68b4e7fb0a 100644 --- a/js/server/upgrade-database.js +++ b/js/server/upgrade-database.js @@ -721,7 +721,7 @@ name: "createFrontend", description: "setup _frontend collection", - system: DATABASE_SYSTEM, + system: DATABASE_ALL, cluster: [CLUSTER_NONE, CLUSTER_COORDINATOR_GLOBAL], database: [DATABASE_INIT, DATABASE_UPGRADE],