Improve reusability of code that is defined out by cmake build paths

 * Added new ARMNN_STUB_PROFILING and ARMNN_DISABLE_DYNAMIC_BACKEND
   defines to replace BUILD_BARE_METAL and BUILD_EXECUTE_NETWORK_STATIC
 * Add new CMake variables to disable sample apps and dynamic backends
 * Improve BUILD_SHARED_LIBS CMake variable
 * Add new archive output location to various libraries so that the
   static libraries appear in the same location as the shared libraries
 * Fixes for bare metal build
 * Add ARMNN_DISABLE_FILE_SYSTEM defines to missing locations

Signed-off-by: Ryan OShea <ryan.oshea3@arm.com>
Change-Id: I1db9a8f483e7134bd261294b35240cf21b150d45

1 files changed, 14 insertions, 12 deletions

diff --git a/src/armnnSerializer/CMakeLists.txt b/src/armnnSerializer/CMakeLists.txt
index 01c51e65d7..20faae955e 100755
--- a/src/armnnSerializer/CMakeLists.txt
+++ b/src/armnnSerializer/CMakeLists.txt
@@ -36,28 +36,30 @@ if(BUILD_ARMNN_SERIALIZER)
         ../armnnDeserializer/Deserializer.cpp
         )
 
-    if(BUILD_BARE_METAL OR EXECUTE_NETWORK_STATIC)
-        add_library_ex(armnnSerializer STATIC ${armnn_serializer_sources})
-    else()
+    include_directories(SYSTEM "${FLATBUFFERS_INCLUDE_PATH}")
+
+    if(BUILD_SHARED_LIBS)
         # We're going to export both a STATIC library and a SHARED library here.
         # In some instances it's easier to include the serializer directly into
         # the target executable or library rather than have yet another .so.
         add_library(armnnSerializer-static STATIC ${armnn_serializer_sources})
         add_library_ex(armnnSerializer SHARED ${armnn_serializer_sources})
-    endif()
 
-    include_directories(SYSTEM "${FLATBUFFERS_INCLUDE_PATH}")
-
-    set_target_properties(armnnSerializer PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
-    target_include_directories(armnnSerializer PRIVATE ../armnn)
-    target_include_directories(armnnSerializer PRIVATE ../armnnUtils)
-    target_include_directories(armnnSerializer PRIVATE ../../generated)
-    if (NOT BARE_METAL AND NOT EXECUTE_NETWORK_STATIC)
         target_include_directories(armnnSerializer-static PRIVATE ../armnn)
         target_include_directories(armnnSerializer-static PRIVATE ../armnnUtils)
         target_include_directories(armnnSerializer-static PRIVATE ../../generated)
+
+        set_target_properties(armnnSerializer PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
+        set_target_properties(armnnSerializer-static PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
+    else()
+        add_library_ex(armnnSerializer STATIC ${armnn_serializer_sources})
+        set_target_properties(armnnSerializer PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
     endif()
 
+    target_include_directories(armnnSerializer PRIVATE ../armnn)
+    target_include_directories(armnnSerializer PRIVATE ../armnnUtils)
+    target_include_directories(armnnSerializer PRIVATE ../../generated)
+
     list(APPEND armnn_serializer_sources
         ArmnnSchema_generated.h
         )
@@ -66,7 +68,7 @@ if(BUILD_ARMNN_SERIALIZER)
     target_include_directories(armnnSerializer SYSTEM PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 
     target_link_libraries(armnnSerializer armnn ${FLATBUFFERS_LIBRARY})
-    if (NOT BARE_METAL AND NOT EXECUTE_NETWORK_STATIC)
+    if (BUILD_SHARED_LIBS)
         install(TARGETS armnnSerializer-static
                 EXPORT  armnn-targets
                 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}