commit 9a5ce4ab5ce777ef683035a4d0f4fcac67847c88
author Colm Donelan <Colm.Donelan@arm.com> Thu Oct 29 11:39:14 2020 +0000
committer Jim Flynn <jim.flynn@arm.com> Thu Oct 29 19:24:16 2020 +0000
tree 5989f29900208e1cbc12d7592824776fd6dfa992
parent 06e0300ccf279c6b0fcbb5ef3b6fa36e00229492

IVGCVSW-5265 Remove boost from core ArmNN CMake

 * Remove all but Boost_UNIT_TEST_FRAMEWORK_LIBRARY from
   ArmNN Cmake files.
 * Remove references to boost::fpc from old test applications.

Signed-off-by: Colm Donelan <Colm.Donelan@arm.com>
Change-Id: Ibb1261dee4b971d1788d2805528aa800a8b883ce

cmake/AddDllCopyCommands.cmake

diff --git a/cmake/AddDllCopyCommands.cmake b/cmake/AddDllCopyCommands.cmake
index 74f6f6f..ff57bb1 100644
--- a/cmake/AddDllCopyCommands.cmake
+++ b/cmake/AddDllCopyCommands.cmake
@@ -72,9 +72,6 @@
             addDllCopyCommand(${target} "${MINGW32_ROOT}/bin/libgfortran-3.dll"     "${MINGW32_ROOT}/bin/libgfortran-3.dll")
             addDllCopyCommand(${target} "${MINGW32_ROOT}/bin/libgcc_s_dw2-1.dll"    "${MINGW32_ROOT}/bin/libgcc_s_dw2-1.dll")
             addDllCopyCommand(${target} "${MINGW32_ROOT}/bin/libquadmath-0.dll"     "${MINGW32_ROOT}/bin/libquadmath-0.dll")
-            addBoostDllCopyCommand(${target} ${Boost_SYSTEM_LIBRARY})
-            addBoostDllCopyCommand(${target} ${Boost_THREAD_LIBRARY})
-            addBoostDllCopyCommand(${target} ${Boost_CHRONO_LIBRARY})
         endif()
     endif()
 endmacro()

cmake/ArmnnConfig.cmake.in

diff --git a/cmake/ArmnnConfig.cmake.in b/cmake/ArmnnConfig.cmake.in
index 1e572fe..e608f86 100644
--- a/cmake/ArmnnConfig.cmake.in
+++ b/cmake/ArmnnConfig.cmake.in
@@ -7,11 +7,6 @@
 
 list(APPEND CMAKE_MODULE_PATH ${ARMNN_CMAKE_DIR})
 
-add_definitions("-DBOOST_ALL_NO_LIB")
-find_package(Boost 1.59 REQUIRED COMPONENTS system filesystem program_options)
-include_directories(SYSTEM "${Boost_INCLUDE_DIRS}")
-link_directories(${Boost_LIBRARY_DIRS})
-
 if(NOT TARGET Armnn::Armnn)
     MESSAGE(STATUS "Armnn Import: ${ARMNN_CMAKE_DIR}/ArmnnTargets.cmake")
     include("${ARMNN_CMAKE_DIR}/ArmnnTargets.cmake")

cmake/GlobalConfig.cmake

diff --git a/cmake/GlobalConfig.cmake b/cmake/GlobalConfig.cmake
index 1db0025..3fb12df 100644
--- a/cmake/GlobalConfig.cmake
+++ b/cmake/GlobalConfig.cmake
@@ -135,7 +135,7 @@
     set(Boost_USE_STATIC_LIBS ON)
   endif()
   add_definitions("-DBOOST_ALL_NO_LIB") # Turn off auto-linking as we specify the libs manually
-  find_package(Boost 1.59 REQUIRED COMPONENTS unit_test_framework filesystem system program_options)
+  find_package(Boost 1.59 REQUIRED COMPONENTS unit_test_framework)
   include_directories(SYSTEM "${Boost_INCLUDE_DIRS}")
   link_directories(${Boost_LIBRARY_DIRS})
 endif()