From: 오형석/On-Device Lab(SR)/Staff Engineer/삼성전자 Date: Thu, 8 Aug 2019 02:44:47 +0000 (+0900) Subject: Replace strict build setting in libs (#6226) X-Git-Tag: submit/tizen/20190809.050447~43 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=06ede61fe16901332df824e9199bc20ccbaf6a1c;p=platform%2Fcore%2Fml%2Fnnfw.git Replace strict build setting in libs (#6226) Replace strict build setting in libs to use nnfw_common interface (except libs/tflite) Signed-off-by: Hyeongseok Oh --- diff --git a/runtimes/libs/ARMComputeEx/CMakeLists.txt b/runtimes/libs/ARMComputeEx/CMakeLists.txt index 513baf8..9882cf6 100644 --- a/runtimes/libs/ARMComputeEx/CMakeLists.txt +++ b/runtimes/libs/ARMComputeEx/CMakeLists.txt @@ -17,8 +17,8 @@ execute_process ( add_library(arm_compute_ex SHARED ${ACL_EX_SRCS}) set_target_properties(arm_compute_ex PROPERTIES COMPILE_FLAGS "-DEMBEDDED_KERNELS=1") target_include_directories(arm_compute_ex PUBLIC ${ACL_EX_BASE}) -target_link_libraries(arm_compute_ex arm_compute_core) -target_compile_options(arm_compute_ex PRIVATE -Wall -Wextra -Werror) +target_link_libraries(arm_compute_ex PRIVATE arm_compute_core) +target_link_libraries(arm_compute_ex PRIVATE nnfw_common) # Defines to enable validate check in debug build target_compile_options(arm_compute_ex PRIVATE $<$:-DARM_COMPUTE_DEBUG_ENABLED>) target_compile_options(arm_compute_ex PRIVATE $<$:-DARM_COMPUTE_ASSERTS_ENABLED>) diff --git a/runtimes/libs/misc/CMakeLists.txt b/runtimes/libs/misc/CMakeLists.txt index f7e4dc7..bdde682 100644 --- a/runtimes/libs/misc/CMakeLists.txt +++ b/runtimes/libs/misc/CMakeLists.txt @@ -8,7 +8,7 @@ list(APPEND NNFW_UTILITY_SRCS src/tensor/Comparator.cpp) add_library(nnfw_lib_misc STATIC ${NNFW_UTILITY_SRCS}) target_include_directories(nnfw_lib_misc PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) set_target_properties(nnfw_lib_misc PROPERTIES POSITION_INDEPENDENT_CODE ON) -target_compile_options(nnfw_lib_misc PRIVATE -Wall -Wextra -Werror) +target_link_libraries(nnfw_lib_misc PRIVATE nnfw_common) add_executable(nnfw_tensor_index_iterator "examples/tensor_index_iterator.cpp") target_link_libraries(nnfw_tensor_index_iterator nnfw_lib_misc) diff --git a/runtimes/libs/profiling/CMakeLists.txt b/runtimes/libs/profiling/CMakeLists.txt index 0134f40..b115cc1 100644 --- a/runtimes/libs/profiling/CMakeLists.txt +++ b/runtimes/libs/profiling/CMakeLists.txt @@ -3,4 +3,4 @@ file(GLOB_RECURSE SOURCES "src/*.cpp") add_library(nnfw_lib_profiling STATIC ${SOURCES}) set_property(TARGET nnfw_lib_profiling PROPERTY POSITION_INDEPENDENT_CODE ON) target_include_directories(nnfw_lib_profiling PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) -target_compile_options(nnfw_lib_profiling PRIVATE -Wall -Wextra -Werror) +target_link_libraries(nnfw_lib_profiling PRIVATE nnfw_common) diff --git a/runtimes/libs/rua/anchor/CMakeLists.txt b/runtimes/libs/rua/anchor/CMakeLists.txt index 9d5dab1..fb41c47 100644 --- a/runtimes/libs/rua/anchor/CMakeLists.txt +++ b/runtimes/libs/rua/anchor/CMakeLists.txt @@ -5,3 +5,4 @@ set_target_properties(nnfw_lib_rua_anchor PROPERTIES POSITION_INDEPENDENT_CODE O target_include_directories(nnfw_lib_rua_anchor PUBLIC include) target_link_libraries(nnfw_lib_rua_anchor PUBLIC nnfw_lib_rua_core) target_link_libraries(nnfw_lib_rua_anchor PRIVATE nnfw_lib_rua_dyn) +target_link_libraries(nnfw_lib_rua_anchor PRIVATE nnfw_common) diff --git a/runtimes/libs/rua/dyn/CMakeLists.txt b/runtimes/libs/rua/dyn/CMakeLists.txt index 007ee4f..01d8a7c 100644 --- a/runtimes/libs/rua/dyn/CMakeLists.txt +++ b/runtimes/libs/rua/dyn/CMakeLists.txt @@ -4,3 +4,4 @@ add_library(nnfw_lib_rua_dyn STATIC ${SOURCES}) set_target_properties(nnfw_lib_rua_dyn PROPERTIES POSITION_INDEPENDENT_CODE ON) target_include_directories(nnfw_lib_rua_dyn PUBLIC include) target_link_libraries(nnfw_lib_rua_dyn PUBLIC nnfw_lib_rua_core) +target_link_libraries(nnfw_lib_rua_dyn PRIVATE nnfw_common) diff --git a/runtimes/libs/xdata/CMakeLists.txt b/runtimes/libs/xdata/CMakeLists.txt index 390e728..cd08370 100644 --- a/runtimes/libs/xdata/CMakeLists.txt +++ b/runtimes/libs/xdata/CMakeLists.txt @@ -1,3 +1,4 @@ add_library(nnfw_lib_xdata SHARED src/trace.cpp) target_include_directories(nnfw_lib_xdata PUBLIC include) target_link_libraries(nnfw_lib_xdata PUBLIC nnfw_lib_xray_event) +target_link_libraries(nnfw_lib_xdata PRIVATE nnfw_common) diff --git a/runtimes/libs/xprobe/CMakeLists.txt b/runtimes/libs/xprobe/CMakeLists.txt index 6b13ce2..04f16b2 100644 --- a/runtimes/libs/xprobe/CMakeLists.txt +++ b/runtimes/libs/xprobe/CMakeLists.txt @@ -3,3 +3,4 @@ target_include_directories(nnfw_lib_xprobe PUBLIC include) target_link_libraries(nnfw_lib_xprobe PUBLIC nnfw_lib_xdata) target_link_libraries(nnfw_lib_xprobe PUBLIC nnfw_lib_xray_pipe) target_link_libraries(nnfw_lib_xprobe PRIVATE nnfw_lib_cpp14) +target_link_libraries(nnfw_lib_xprobe PRIVATE nnfw_common) diff --git a/runtimes/libs/xray/mux/CMakeLists.txt b/runtimes/libs/xray/mux/CMakeLists.txt index d67454b..6fff931 100644 --- a/runtimes/libs/xray/mux/CMakeLists.txt +++ b/runtimes/libs/xray/mux/CMakeLists.txt @@ -3,5 +3,6 @@ set_target_properties(nnfw_lib_xray_mux PROPERTIES POSITION_INDEPENDENT_CODE ON) target_include_directories(nnfw_lib_xray_mux PUBLIC include) target_link_libraries(nnfw_lib_xray_mux PUBLIC nnfw_lib_xray_event) target_link_libraries(nnfw_lib_xray_mux PUBLIC nnfw_lib_xray_pipe) +target_link_libraries(nnfw_lib_xray_mux PRIVATE nnfw_common) install(TARGETS nnfw_lib_xray_mux LIBRARY DESTINATION lib)