diff options
| -rw-r--r-- | samples/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/dynamic/sample/CMakeLists.txt | 19 |
2 files changed, 8 insertions, 13 deletions
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt index 5505de0bec..2ff556c8c1 100644 --- 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 65ad8a1660..cbf980e6cc 100644 --- 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}) |