Reorganize the header directory to distinguish the private headers

Change-Id: I171257c61fdf452eb93921a8343f2b4583da7b31
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 946d2c7..b735be0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,6 @@ SET(INCDIR "${CMAKE_INSTALL_INCLUDEDIR}/context-service")
 
 INCLUDE_DIRECTORIES(
        ${CMAKE_INSTALL_PREFIX}/${INCDIR}/private
-       ${CMAKE_SOURCE_DIR}/include
        ${CMAKE_SOURCE_DIR}/src/shared
 )
 
@@ -21,15 +20,8 @@ SET(PC_INCLUDE "${CMAKE_INSTALL_PREFIX}/${INCDIR}")
 SET(PC_LIBDIR "${CMAKE_INSTALL_LIBDIR}")
 
 INSTALL(
-       FILES ${CMAKE_SOURCE_DIR}/include/SensorRecorderService.h
-       DESTINATION ${INCDIR}/private
-)
-INSTALL(
        DIRECTORY ${CMAKE_SOURCE_DIR}/include/
        DESTINATION ${INCDIR}
-       FILES_MATCHING
-       PATTERN "*.h"
-       PATTERN "SensorRecorderService.h" EXCLUDE
 )
 
 ADD_SUBDIRECTORY(src/client-dummy)

diff --git a/include/SensorRecorderService.h b/include/private/SensorRecorderService.h
similarity index 100%
rename from include/SensorRecorderService.h
rename to include/private/SensorRecorderService.h

diff --git a/src/client-dummy/CMakeLists.txt b/src/client-dummy/CMakeLists.txt
index 536f8a1..e768488 100644 (file)
--- a/src/client-dummy/CMakeLists.txt
+++ b/src/client-dummy/CMakeLists.txt
@@ -2,6 +2,10 @@ SET(target "${PROJECT_NAME}-client")
 
 SET(DEPS "${DEPS} context-common-client")
 
+INCLUDE_DIRECTORIES(
+       ${CMAKE_SOURCE_DIR}/include
+)
+
 FILE(GLOB_RECURSE SRCS *.cpp)
 MESSAGE("Sources: ${SRCS}")
 

diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index 8f551d7..2e6ef32 100644 (file)
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -2,6 +2,10 @@ SET(target "${PROJECT_NAME}-client-genuine")
 
 SET(DEPS "${DEPS} context-common-client")
 
+INCLUDE_DIRECTORIES(
+       ${CMAKE_SOURCE_DIR}/include
+)
+
 FILE(GLOB_RECURSE SRCS *.cpp ../shared/*.cpp)
 MESSAGE("Sources: ${SRCS}")
 

diff --git a/src/server-dummy/CMakeLists.txt b/src/server-dummy/CMakeLists.txt
index e0dcdd5..62ba1e9 100644 (file)
--- a/src/server-dummy/CMakeLists.txt
+++ b/src/server-dummy/CMakeLists.txt
@@ -2,6 +2,10 @@ SET(target "${PROJECT_NAME}-server")
 
 SET(DEPS "${DEPS} context-common-server")
 
+INCLUDE_DIRECTORIES(
+       ${CMAKE_SOURCE_DIR}/include/private
+)
+
 FILE(GLOB_RECURSE SRCS *.cpp)
 MESSAGE("Sources: ${SRCS}")
 

diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index 64a741f..839d274 100644 (file)
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -2,6 +2,10 @@ SET(target "${PROJECT_NAME}-server-genuine")
 
 SET(DEPS "${DEPS} context-common-server")
 
+INCLUDE_DIRECTORIES(
+       ${CMAKE_SOURCE_DIR}/include/private
+)
+
 FILE(GLOB_RECURSE SRCS *.cpp ../shared/*.cpp)
 MESSAGE("Sources: ${SRCS}")