mutriz

commit a182f962b8332a363fbdb31865a9c644fa180a95
parent 5a40a7084809148b757dd0f8054f29ea4f72d340
Author: MTRNord <mtrnord1@gmail.com>
Date:   Sat,  7 Apr 2018 16:11:17 +0200

Update MtxClient

Diffstat:
M
.gitignore
 | 
4
++++
M
.idea/vcs.xml
 | 
2
+-
M
cmake/Boost.cmake
 | 
17
++++++++++-------
M
cmake/Mtxclient.cmake
 | 
2
+-

4 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -35,6 +35,7 @@ CTestTestfile.cmake
 cmake-build-debug/
 cmake-build-debug-visualstudio/
 cmake-build-release/
+cmake-build-release-visualstudio/
 
 # Mongo Explorer plugin:
 .idea/**/mongoSettings.xml
@@ -96,3 +97,5 @@ fabric.properties
 *.app
 
 .third-party/
+json.hpp
+variant.hpp
+\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.third-party/mtxclient" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>
 \ No newline at end of file
diff --git a/cmake/Boost.cmake b/cmake/Boost.cmake
@@ -10,8 +10,8 @@ set(BUNDLED_BOOST_ROOT ${THIRD_PARTY_ROOT}/boost_1_66_0)
 ExternalProject_Add(
   Boost
 
-  URL https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.bz2
-  URL_HASH SHA256=5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9
+  URL https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.zip
+  URL_HASH SHA256=e1c55ebb00886c1a96528e4024be98a38b815115f62ecfe878fcf587ba715aad
   DOWNLOAD_DIR ${THIRD_PARTY_ROOT}/downloads
   DOWNLOAD_NO_PROGRESS 0
 
@@ -19,13 +19,16 @@ ExternalProject_Add(
   SOURCE_DIR ${BUNDLED_BOOST_ROOT}
   CONFIGURE_COMMAND ${BUNDLED_BOOST_ROOT}/bootstrap.sh
     --with-libraries=random,thread,system,iostreams
-    --prefix=${BUNDLED_BOOST_ROOT}
-  BUILD_COMMAND ${BUNDLED_BOOST_ROOT}/b2 -d0 variant=release link=static threading=multi
+    --prefix=${BUNDLED_BOOST_ROOT}/build
+  BUILD_COMMAND ${BUNDLED_BOOST_ROOT}/b2 -d0 --layout=system --abbreviate-paths toolset=msvc variant=release link=static threading=multi
   INSTALL_COMMAND ${BUNDLED_BOOST_ROOT}/b2 -d0 install
 )
 
-set(Boost_INCLUDE_DIRS ${BUNDLED_BOOST_ROOT})
-set(Boost_LIBRARIES boost_random boost_system boost_thread boost_iostreams)
-
+set(Boost_INCLUDE_DIRS ${BUNDLED_BOOST_ROOT}/build)
+if(MSVC)
+    set(Boost_LIBRARIES libboost_random libboost_system libboost_thread libboost_iostreams)
+else()
+    set(Boost_LIBRARIES boost_random boost_system boost_thread boost_iostreams)
+endif()
 include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
 link_directories(${Boost_INCLUDE_DIRS}/stage/lib)
diff --git a/cmake/Mtxclient.cmake b/cmake/Mtxclient.cmake
@@ -21,7 +21,7 @@ ExternalProject_Add(
         Mtxclient
 
         GIT_REPOSITORY https://github.com/mujx/mtxclient
-        GIT_TAG 6ecda9ed78244b1d2aa71eb043fd51cb49a9c75d
+        GIT_TAG 88856df5a7448dd55df4c5f4b86f309cbecc648e
 
         BUILD_IN_SOURCE 1
         SOURCE_DIR ${MTXCLIENT_ROOT}