IVGCVSW-4402 add boost and armnn path to sample dynamic backend

Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
Change-Id: Ibeed3301352d8f15e144f8466d8a26b21c744b84

diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index 5505de0..2ff556c 100644 (file)
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -3,7 +3,7 @@ if(BUILD_SAMPLE_APP AND ARMNNREF)
     target_link_libraries(SimpleSample armnn ${CMAKE_THREAD_LIBS_INIT})
 endif()
 
-if(SAMPLE_DYNAMIC_BACKEND)
+if(BUILD_SAMPLE_APP AND SAMPLE_DYNAMIC_BACKEND)
     add_executable(DynamicSample DynamicSample.cpp)
     target_link_libraries(DynamicSample armnn ${CMAKE_THREAD_LIBS_INIT})
 endif()

diff --git a/src/dynamic/sample/CMakeLists.txt b/src/dynamic/sample/CMakeLists.txt
index 65ad8a1..cbf980e 100644 (file)
--- a/src/dynamic/sample/CMakeLists.txt
+++ b/src/dynamic/sample/CMakeLists.txt
@@ -8,12 +8,10 @@ project(sample-dynamic)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-if("${CMAKE_SYSTEM_NAME}" STREQUAL Android)
-    add_definitions("-DBOOST_ALL_NO_LIB") # Turn off auto-linking as we specify the libs manually
-    find_package(Boost REQUIRED COMPONENTS system filesystem)
-    include_directories(SYSTEM "${Boost_INCLUDE_DIRS}")
-    link_directories(${Boost_LIBRARY_DIRS})
-endif()
+add_definitions("-DBOOST_ALL_NO_LIB") # Turn off auto-linking as we specify the libs manually
+find_package(Boost REQUIRED COMPONENTS system filesystem)
+include_directories(SYSTEM "${Boost_INCLUDE_DIRS}")
+link_directories(${Boost_LIBRARY_DIRS})
 
 list(APPEND armnnSampleDynamicBackend_sources
         SampleDynamicAdditionWorkload.cpp
@@ -38,9 +36,6 @@ target_include_directories(Arm_SampleDynamic_backend PRIVATE ${PROJECT_SOURCE_DI
 target_include_directories(Arm_SampleDynamic_backend PRIVATE ${PROJECT_SOURCE_DIR}/../../../src/armnnUtils)
 target_include_directories(Arm_SampleDynamic_backend PRIVATE ${PROJECT_SOURCE_DIR}/../../../src/backends)
 target_include_directories(Arm_SampleDynamic_backend PRIVATE ${PROJECT_SOURCE_DIR}/../../../src/profiling)
-
-if("${CMAKE_SYSTEM_NAME}" STREQUAL Android)
-    target_include_directories(Arm_SampleDynamic_backend PRIVATE ${Boost_INCLUDE_DIRS})
-    target_link_libraries(Arm_SampleDynamic_backend ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY})
-    target_link_libraries(Arm_SampleDynamic_backend ${ARMNN_PATH})
-endif()
+target_include_directories(Arm_SampleDynamic_backend PRIVATE ${Boost_INCLUDE_DIRS})
+target_link_libraries(Arm_SampleDynamic_backend ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY})
+target_link_libraries(Arm_SampleDynamic_backend ${ARMNN_PATH})