From: Inkyun Kil Date: Wed, 4 Mar 2020 07:36:30 +0000 (+0900) Subject: Rearrange including header for apis X-Git-Tag: submit/tizen/20200305.032544~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F28%2F226628%2F4;p=platform%2Fcore%2Fappfw%2Fwidget-viewer.git Rearrange including header for apis Change-Id: Ie5bd34dda348ee64aeb6fdf5d544ec916717786f Signed-off-by: Inkyun Kil --- diff --git a/watch-holder/CMakeLists.txt b/watch-holder/CMakeLists.txt index c21437ec..e7fe5e11 100644 --- a/watch-holder/CMakeLists.txt +++ b/watch-holder/CMakeLists.txt @@ -23,6 +23,8 @@ pkg_check_modules(watch-holder REQUIRED vconf ) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/api) + AUX_SOURCE_DIRECTORY(src BUILD_SOURCE) AUX_SOURCE_DIRECTORY(api BUILD_SOURCE) diff --git a/watch-holder/api/sharable_watch.cc b/watch-holder/api/sharable_watch.cc index 430c630e..92270e4b 100644 --- a/watch-holder/api/sharable_watch.cc +++ b/watch-holder/api/sharable_watch.cc @@ -13,11 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "../src/watch.hh" #include "watch.h" #include "sharable_watch.h" +#include "../src/watch.hh" + + #ifndef C_EXPORT #define C_EXPORT extern "C" __attribute__((visibility("default"))) #endif diff --git a/watch-holder/api/sharable_watch.h b/watch-holder/api/sharable_watch.h index a1599dab..1f7fb6a7 100644 --- a/watch-holder/api/sharable_watch.h +++ b/watch-holder/api/sharable_watch.h @@ -20,7 +20,7 @@ #include #include -#include "watch_holder_error.h" +#include #ifdef __cplusplus extern "C" { diff --git a/watch-holder/api/watch.h b/watch-holder/api/watch.h index 11478249..505035e9 100644 --- a/watch-holder/api/watch.h +++ b/watch-holder/api/watch.h @@ -17,10 +17,11 @@ #ifndef __WATCH_H__ #define __WATCH_H__ -#include "watch_holder_error.h" #include #include +#include + #ifdef __cplusplus extern "C" { #endif diff --git a/watch-holder/api/watch_holder.h b/watch-holder/api/watch_holder.h index 62ed809a..b72681dc 100644 --- a/watch-holder/api/watch_holder.h +++ b/watch-holder/api/watch_holder.h @@ -21,7 +21,8 @@ #include #include -#include "watch.h" +#include +#include #ifdef __cplusplus extern "C" { diff --git a/watch-holder/api/watch_mirror.cc b/watch-holder/api/watch_mirror.cc index 1c55a497..0490248f 100644 --- a/watch-holder/api/watch_mirror.cc +++ b/watch-holder/api/watch_mirror.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include -#include - #include "watch_mirror.h" #include "../src/watch_mirror.hh" +#include +#include + #ifndef C_EXPORT #define C_EXPORT extern "C" __attribute__((visibility("default"))) #endif diff --git a/watch-holder/api/watch_mirror.h b/watch-holder/api/watch_mirror.h index 18f36b96..0e3f4c84 100644 --- a/watch-holder/api/watch_mirror.h +++ b/watch-holder/api/watch_mirror.h @@ -20,7 +20,8 @@ #include #include -#include "sharable_watch.h" +#include +#include #ifdef __cplusplus extern "C" {