Merge pull request #145 from jcarpent/devel

jcarpent · web-flow · commit ed34f0157710 · 2020-01-29T10:44:44.000+01:00
Sync submodule
diff --git a/cmake b/cmake
@@ -1 +1 @@
-Subproject commit 2de34adfce816937d2403cb602261ade0c26f0cd
+Subproject commit ba8e9f82f52d74865b42262de61bb884bf373550
diff --git a/travis_custom/custom_build b/travis_custom/custom_build
@@ -2,7 +2,7 @@
 set -e
 
 # Setup environment variables.
-export CMAKE_ADDITIONAL_OPTIONS=" ${CMAKE_ADDITIONAL_OPTIONS} -DBUILD_BENCHMARK=\"ON\" -DBUILD_UNIT_TESTS=\"ON\" -DCMAKE_CXX_FLAGS=-DBOOST_SYSTEM_NO_DEPRECATED"
+export CMAKE_ADDITIONAL_OPTIONS=" ${CMAKE_ADDITIONAL_OPTIONS} -DBUILD_BENCHMARK=\"ON\" -DBUILD_UNIT_TESTS=\"ON\" -DCMAKE_CXX_FLAGS=-DBOOST_SYSTEM_NO_DEPRECATED -DPYTHON_EXECUTABLE=$(which python)"
 if [[ ";${DO_INSTALL_DOC_EXCEPT_ON_BRANCH};" == *";${CI_BRANCH};"* ]]; then
   export CMAKE_ADDITIONAL_OPTIONS=" ${CMAKE_ADDITIONAL_OPTIONS} -DINSTALL_DOCUMENTATION=\"OFF\""
 else
