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 --- CMakeLists.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 13d7077de9..8f5a0bd046 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -184,7 +184,6 @@ if(BUILD_ARMNN_QUANTIZER AND ARMNNREF) armnn ${Boost_SYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY} - ${Boost_FILESYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY} ) add_executable_ex(ArmnnQuantizer @@ -196,7 +195,6 @@ if(BUILD_ARMNN_QUANTIZER AND ARMNNREF) target_link_libraries(ArmnnQuantizer ${Boost_SYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY} - ${Boost_FILESYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY} ) target_link_libraries(ArmnnQuantizer @@ -611,7 +609,7 @@ endif() install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) target_link_libraries(armnn ${Boost_THREAD_LIBRARY} - ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY}) + ${Boost_SYSTEM_LIBRARY}) if(ARMCOMPUTENEON OR ARMCOMPUTECL) target_link_libraries(armnn ${ARMCOMPUTE_LIBRARIES}) @@ -1029,7 +1027,6 @@ if (BUILD_ARMNN_SERIALIZER AND (BUILD_TF_PARSER OR BUILD_TF_LITE_PARSER OR BUILD target_link_libraries(ArmnnConverter ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(ArmnnConverter ${Boost_SYSTEM_LIBRARY} - ${Boost_FILESYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY}) addDllCopyCommands(ArmnnConverter) endif() -- cgit v1.2.1