From 532a29d12d72f54549d8b71edd485c17af65698a Mon Sep 17 00:00:00 2001 From: Francis Murtagh Date: Mon, 29 Jun 2020 11:50:01 +0100 Subject: IVGCVSW-4487 Remove boost::filesystem * Replace filesystem::path * Replace filesystem::exists * Replace filesystem::is_directory * Replace filesystem::directory_iterator * Replace filesystem::filesystem_error exception * Replace filesystem::temp_directory_path * Replace filesystem::unique path * Replace filesystem::ofstream with std::ofstream * Replace filesystem::remove * Replace filesystem::is_regular_file * Replace boost::optional with armnn::Optional in touched files * Remove some superfluous includes * Update build guides, GlobalConfig.cmake and CMakeLists.txt * Remove redundant armnnUtils::Filesystem::Remove function. * Remove redundant armnnUtils::Filesystem::GetFileSize function. Temporarily adding back Boost::filesystem to enable Boost::dll. Signed-off-by: Francis Murtagh Signed-off-by: Colm Donelan Change-Id: Ifa46d4a0097d2612ddacd8e9736c0b36e365fb11 --- BuildGuideAndroidNDK.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'BuildGuideAndroidNDK.md') diff --git a/BuildGuideAndroidNDK.md b/BuildGuideAndroidNDK.md index 70844564a7..79de1fcf58 100644 --- a/BuildGuideAndroidNDK.md +++ b/BuildGuideAndroidNDK.md @@ -54,7 +54,7 @@ All downloaded or generated files will be saved inside the `~/armnn-devenv` dire cd ~/armnn-devenv/boost/boost_1_64_0 ./bootstrap.sh --prefix=$HOME/armnn-devenv/boost/install ./b2 install --user-config=$HOME/armnn-devenv/boost/user-config.jam \ - toolset=clang-arm link=static cxxflags=-fPIC --with-filesystem \ + toolset=clang-arm link=static cxxflags=-fPIC \ --with-test --with-log --with-program_options -j16 ``` Note: You can specify the 'Android_API' version you want. For example, if your ANDROID_API is 27 then the compiler will be aarch64-linux-android27-clang++. @@ -230,7 +230,6 @@ All downloaded or generated files will be saved inside the `~/armnn-devenv` dire -DCMAKE_MODULE_LINKER_FLAGS="-llog" \ -DBOOST_ROOT=$HOME/armnn-devenv/boost/install \ -DBoost_SYSTEM_LIBRARY=$HOME/armnn-devenv/boost/install/lib/libboost_system.a \ - -DBoost_FILESYSTEM_LIBRARY=$HOME/armnn-devenv/boost/install/lib/libboost_filesystem.a \ -DARMNN_PATH=$HOME/armnn-devenv/armnn/build/libarmnn.so .. ``` -- cgit v1.2.1