summaryrefslogtreecommitdiff
path: root/src/3rd_party
diff options
context:
space:
mode:
authorJacob Keeler <jacob.keeler@livioradio.com>2017-08-15 16:20:58 -0400
committerGitHub <noreply@github.com>2017-08-15 16:20:58 -0400
commit3c02c69a10240f4838e05d7fd0e10e12ed9ea808 (patch)
tree7f6f08e39dcc0dde8a0148c6ae8ec18fd759ec8f /src/3rd_party
parent38b4426e797c6cde7e4e88467f85bd31e7464644 (diff)
downloadsdl_core-3c02c69a10240f4838e05d7fd0e10e12ed9ea808.tar.gz
Update clone URL and fix build step
Updated the clone URL of the repository, because the necessary changes were merged in. Updated the pre-configure `touch` command due to changes in the BSON library
Diffstat (limited to 'src/3rd_party')
-rw-r--r--src/3rd_party/CMakeLists.txt6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/3rd_party/CMakeLists.txt b/src/3rd_party/CMakeLists.txt
index 9abc187d0c..adafe686ab 100644
--- a/src/3rd_party/CMakeLists.txt
+++ b/src/3rd_party/CMakeLists.txt
@@ -303,15 +303,13 @@ if (${BSON_LIB} MATCHES "BSON_LIB-NOTFOUND")
endif()
include(ExternalProject)
ExternalProject_Add(libbson
- GIT_REPOSITORY "http://github.com/LuxoftAKutsan/bson_c_lib.git"
-# TODO Change GIT_REPOSITORY to http://github.com/smartdevicelink/bson_c_lib.git
-# after merge of https://github.com/smartdevicelink/bson_c_lib/pull/2
+ GIT_REPOSITORY "http://github.com/smartdevicelink/bson_c_lib.git"
GIT_TAG "master"
BINARY_DIR ${BSON_LIB_SOURCE_DIRECTORY}
INSTALL_DIR ${3RD_PARTY_INSTALL_PREFIX}
DOWNLOAD_DIR ${BSON_LIB_SOURCE_DIRECTORY}
SOURCE_DIR ${BSON_LIB_SOURCE_DIRECTORY}
- CONFIGURE_COMMAND touch aclocal.m4 configure.ac Makefile.am Makefile.in configure && ./configure --prefix=${3RD_PARTY_INSTALL_PREFIX}
+ CONFIGURE_COMMAND touch aclocal.m4 configure.ac Makefile.am Makefile.in configure config.h.in && ./configure --prefix=${3RD_PARTY_INSTALL_PREFIX}
BUILD_COMMAND make
INSTALL_COMMAND ${BSON_INSTALL_COMMAND})
else()