diff options
| author | Sadik Armagan <sadik.armagan@arm.com> | 2019-05-02 09:31:38 +0100 |
|---|---|---|
| committer | Sadik Armagan <sadik.armagan@arm.com> | 2019-05-02 09:31:38 +0100 |
| commit | 93e2e40500b2e0b7a47f3214a9b0499da50476b0 (patch) | |
| tree | 31dc034df4b55d965b77d8f56bfe94de2e9429d1 /tests | |
| parent | 49937f3da53c78a5fdd8fdfbd007993572d5f926 (diff) | |
| download | armnn-93e2e40500b2e0b7a47f3214a9b0499da50476b0.tar.gz | |
IVGCVSW-2941 THIRD_PARTY_INCLUDE_DIRS is not set in armnn/tests/CMakeLists.txt for external builds
* Added stb_image libraries under third-party/stb_image
* Updates test/CMakeLists.txt to include those stb_image libraries
* stb_image libraries are dual-licensed under public domain and MIT
Change-Id: Ic179928598bb236d39fb5992042183099e78a0d7
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/InferenceTestImage.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index a0e4bf85b5..028fc8283f 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,8 +1,6 @@ # UnitTests include(CheckIncludeFiles) -include_directories(SYSTEM "${THIRD_PARTY_INCLUDE_DIRS}") - # Setup the inference test framework set(inference_test_sources ClassifierTestCaseData.hpp @@ -12,9 +10,11 @@ set(inference_test_sources InferenceTest.cpp InferenceTestImage.hpp InferenceTestImage.cpp) + add_library_ex(inferenceTest STATIC ${inference_test_sources}) target_include_directories(inferenceTest PRIVATE ../src/armnnUtils) target_include_directories(inferenceTest PRIVATE ../src/backends) +target_include_directories(inferenceTest PRIVATE ../third-party/stb) if(BUILD_CAFFE_PARSER) macro(CaffeParserTest testName sources) diff --git a/tests/InferenceTestImage.cpp b/tests/InferenceTestImage.cpp index c305d43277..b011e6ac8f 100644 --- a/tests/InferenceTestImage.cpp +++ b/tests/InferenceTestImage.cpp @@ -12,13 +12,13 @@ #include <array> #define STB_IMAGE_IMPLEMENTATION -#include <stb_image.h> +#include <stb/stb_image.h> #define STB_IMAGE_RESIZE_IMPLEMENTATION -#include <stb_image_resize.h> +#include <stb/stb_image_resize.h> #define STB_IMAGE_WRITE_IMPLEMENTATION -#include <stb_image_write.h> +#include <stb/stb_image_write.h> namespace { |