Simplify include directory setting

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b735be0..94cb00a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,6 +8,8 @@ SET(INCDIR "${CMAKE_INSTALL_INCLUDEDIR}/context-service")
 INCLUDE_DIRECTORIES(
        ${CMAKE_INSTALL_PREFIX}/${INCDIR}/private
        ${CMAKE_SOURCE_DIR}/src/shared
+       ${CMAKE_SOURCE_DIR}/include
+       ${CMAKE_SOURCE_DIR}/include/private
 )
 
 ADD_DEFINITIONS(-O2 -Wall -fPIC -fdata-sections -ffunction-sections -fvisibility=hidden)

diff --git a/src/client-dummy/CMakeLists.txt b/src/client-dummy/CMakeLists.txt
index e768488..536f8a1 100644 (file)
--- a/src/client-dummy/CMakeLists.txt
+++ b/src/client-dummy/CMakeLists.txt
@@ -2,10 +2,6 @@ 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 2e6ef32..8f551d7 100644 (file)
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -2,10 +2,6 @@ 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 62ba1e9..e0dcdd5 100644 (file)
--- a/src/server-dummy/CMakeLists.txt
+++ b/src/server-dummy/CMakeLists.txt
@@ -2,10 +2,6 @@ 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 839d274..64a741f 100644 (file)
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -2,10 +2,6 @@ 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}")