[RUA] Update CMake target name & ifdef guard (#5255)

With this commit, RUA becomes consistent with other libraries in NNFW
in terms of CMake target name and ifdef guard.

Signed-off-by: Jonghyun Park <jh1302.park@samsung.com>

diff --git a/libs/rua/anchor/CMakeLists.txt b/libs/rua/anchor/CMakeLists.txt
index a48d3ef..9d5dab1 100644 (file)
--- a/libs/rua/anchor/CMakeLists.txt
+++ b/libs/rua/anchor/CMakeLists.txt
@@ -1,7 +1,7 @@
 file(GLOB_RECURSE SOURCES "src/*.cpp")
 
-add_library(rua-anchor STATIC ${SOURCES})
-set_target_properties(rua-anchor PROPERTIES POSITION_INDEPENDENT_CODE ON)
-target_include_directories(rua-anchor PUBLIC include)
-target_link_libraries(rua-anchor PUBLIC rua-core)
-target_link_libraries(rua-anchor PRIVATE rua-dyn)
+add_library(nnfw_lib_rua_anchor STATIC ${SOURCES})
+set_target_properties(nnfw_lib_rua_anchor PROPERTIES POSITION_INDEPENDENT_CODE ON)
+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)

diff --git a/libs/rua/anchor/include/rua/Anchor.h b/libs/rua/anchor/include/rua/Anchor.h
index 7a69328..f6056ab 100644 (file)
--- a/libs/rua/anchor/include/rua/Anchor.h
+++ b/libs/rua/anchor/include/rua/Anchor.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __RUA_ANCHOR_H__
-#define __RUA_ANCHOR_H__
+#ifndef __NNFW_RUA_ANCHOR_H__
+#define __NNFW_RUA_ANCHOR_H__
 
 #include <rua/Service.h>
 
@@ -35,4 +35,4 @@ struct Anchor
 
 } // namespace rua
 
-#endif // __RUA_ANCHOR_H__
+#endif // __NNFW_RUA_ANCHOR_H__

diff --git a/libs/rua/core/CMakeLists.txt b/libs/rua/core/CMakeLists.txt
index 9cc5b5a..4ea4eea 100644 (file)
--- a/libs/rua/core/CMakeLists.txt
+++ b/libs/rua/core/CMakeLists.txt
@@ -1,3 +1,3 @@
-add_library(rua-core INTERFACE)
-target_include_directories(rua-core INTERFACE include)
-target_link_libraries(rua-core INTERFACE nnapi-header)
+add_library(nnfw_lib_rua_core INTERFACE)
+target_include_directories(nnfw_lib_rua_core INTERFACE include)
+target_link_libraries(nnfw_lib_rua_core INTERFACE nnapi-header)

diff --git a/libs/rua/core/include/rua/Service.h b/libs/rua/core/include/rua/Service.h
index 9d2a1a7..a79524a 100644 (file)
--- a/libs/rua/core/include/rua/Service.h
+++ b/libs/rua/core/include/rua/Service.h
@@ -18,8 +18,8 @@
  * @file Service.h
  * @brief Core abstraction that RUA depends on.
  */
-#ifndef __RUA_SERVICE_H__
-#define __RUA_SERVICE_H__
+#ifndef __NNFW_RUA_SERVICE_H__
+#define __NNFW_RUA_SERVICE_H__
 
 #include "NeuralNetworks.h"
 
@@ -155,4 +155,4 @@ struct RuntimeService
 
 } // namespace rua
 
-#endif // __RUA_SERVICE_H__
+#endif // __NNFW_RUA_SERVICE_H__

diff --git a/libs/rua/dyn/CMakeLists.txt b/libs/rua/dyn/CMakeLists.txt
index 0dc6083..007ee4f 100644 (file)
--- a/libs/rua/dyn/CMakeLists.txt
+++ b/libs/rua/dyn/CMakeLists.txt
@@ -1,6 +1,6 @@
 file(GLOB_RECURSE SOURCES "src/*.cpp")
 
-add_library(rua-dyn STATIC ${SOURCES})
-set_target_properties(rua-dyn PROPERTIES POSITION_INDEPENDENT_CODE ON)
-target_include_directories(rua-dyn PUBLIC include)
-target_link_libraries(rua-dyn PUBLIC rua-core)
+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)

diff --git a/libs/rua/dyn/include/rua/DynamicBinder.h b/libs/rua/dyn/include/rua/DynamicBinder.h
index f1ae841..8ce0c42 100644 (file)
--- a/libs/rua/dyn/include/rua/DynamicBinder.h
+++ b/libs/rua/dyn/include/rua/DynamicBinder.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __RUA_DYNAMIC_BINDER_H__
-#define __RUA_DYNAMIC_BINDER_H__
+#ifndef __NNFW_RUA_DYNAMIC_BINDER_H__
+#define __NNFW_RUA_DYNAMIC_BINDER_H__
 
 #include <rua/Service.h>
 
@@ -32,4 +32,4 @@ struct DynamicBinder
 
 } // namespace
 
-#endif // __RUA_DYNAMIC_BINDER_H__
+#endif // __NNFW_RUA_DYNAMIC_BINDER_H__

diff --git a/libs/rua/shim/CMakeLists.txt b/libs/rua/shim/CMakeLists.txt
index 62d0d1c..814db5f 100644 (file)
--- a/libs/rua/shim/CMakeLists.txt
+++ b/libs/rua/shim/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_library(rua-shim INTERFACE)
-target_include_directories(rua-shim INTERFACE include)
-target_link_libraries(rua-shim INTERFACE rua-core)
-target_link_libraries(rua-shim INTERFACE rua-anchor)
+add_library(nnfw_lib_rua_shim INTERFACE)
+target_include_directories(nnfw_lib_rua_shim INTERFACE include)
+target_link_libraries(nnfw_lib_rua_shim INTERFACE nnfw_lib_rua_core)
+target_link_libraries(nnfw_lib_rua_shim INTERFACE nnfw_lib_rua_anchor)

diff --git a/libs/rua/shim/include/rua/Shim.h b/libs/rua/shim/include/rua/Shim.h
index 564c3d3..07a4bb2 100644 (file)
--- a/libs/rua/shim/include/rua/Shim.h
+++ b/libs/rua/shim/include/rua/Shim.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __RUA_SHIM_H__
-#define __RUA_SHIM_H__
+#ifndef __NNFW_RUA_SHIM_H__
+#define __NNFW_RUA_SHIM_H__
 
 #include <rua/Anchor.h>
 
@@ -189,4 +189,4 @@ inline void ANeuralNetworksExecution_free(ANeuralNetworksExecution *execution)
   return rua::Anchor::get()->execution()->free(execution);
 }
 
-#endif // __RUA_SHIM_H__
+#endif // __NNFW_RUA_SHIM_H__