Fix build issues

flexferrum · flexferrum · commit 17cfa4c246b8 · 2019-08-07T22:41:40.000+03:00
diff --git a/external/external/build.sh b/external/external/build.sh
@@ -3,7 +3,7 @@
 SRC_DIR=`pwd`
 mkdir -p .jinja2cpp-build && cd .jinja2cpp-build
 echo $SRC_DIR
-cmake ../../../thirdparty/Jinja2Cpp -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../.jinja2cpp-install -DJINJA2CPP_BUILD_TESTS=OFF -DJINJA2CPP_DEPS_MODE=external -DCMAKE_PREFIX_PATH="$SRC_DIR/../../thirdparty/expected-lite;$SRC_DIR/../../thirdparty/variant-lite;$SRC_DIR/../../thirdparty/optional-lite;$SRC_DIR/../../thirdparty/string-view-lite;$SRC_DIR/../../thirdparty/fmt;$SRC_DIR/../../thirdparty/robin-hood-hashing"
+cmake ../../../thirdparty/Jinja2Cpp -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../.jinja2cpp-install -DJINJA2CPP_BUILD_TESTS=OFF -DJINJA2CPP_DEPS_MODE=external -DCMAKE_PREFIX_PATH="$SRC_DIR/../../thirdparty/expected-lite;$SRC_DIR/../../thirdparty/variant-lite;$SRC_DIR/../../thirdparty/optional-lite;$SRC_DIR/../../thirdparty/string-view-lite;$SRC_DIR/../../thirdparty/fmt;$SRC_DIR/../../thirdparty/robin-hood-hashing/src"
 cmake --build . --target install
 cd .. && mkdir -p .build && cd .build
 cmake -DCMAKE_BUILD_TYPE=Release -Djinja2cpp_DIR=../.jinja2cpp-install/lib/jinja2cpp ..
diff --git a/subproject/external/CMakeLists.txt b/subproject/external/CMakeLists.txt
@@ -25,7 +25,7 @@ set (CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/optional-lite
     ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/string-view-lite
     ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/fmt
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/robin-hood-hashing
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/robin-hood-hashing/src
 )
 
 add_subdirectory (../../thirdparty/Jinja2Cpp ${CMAKE_CURRENT_BINARY_DIR}/thirdparty/jinja2cpp)
diff --git a/thirdparty/Jinja2Cpp b/thirdparty/Jinja2Cpp
@@ -1 +1 @@
-Subproject commit 24893a2741cd887118ef931d0e8c3b2d56153345
+Subproject commit c8d962e3e9471bcae36a9f9c4bc0b498d6b664f5

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ set (CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}`
`25`	`25`	`${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/optional-lite`
`26`	`26`	`${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/string-view-lite`
`27`	`27`	`${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/fmt`
`28`		`- ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/robin-hood-hashing`
	`28`	`+ ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/robin-hood-hashing/src`
`29`	`29`	`)`
`30`	`30`
`31`	`31`	`add_subdirectory (../../thirdparty/Jinja2Cpp ${CMAKE_CURRENT_BINARY_DIR}/thirdparty/jinja2cpp)`