Distinguish between system headers and project headers.

[Issue#] During compilation system and project headers were included the same way.
[Bug] N/A
[Cause] N/A
[Solution] Use -isystem flag to include system headers. In CMake files it's done by INCLUDE_DIRECTORY( SYSTEM ... ).
[Verification] Build. No warnings from system headers.

Change-Id: I275281d33fc262ba67b79bc523b3f994ace9ec9b

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4d3dc0d..e81c8ab 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -60,16 +60,26 @@ SET(PLUGIN_LOADING_INCLUDES
 )
 
 SET(WRT_BASIC_DEP
-    openssl
-    libpcrecpp
     dpl-popup-efl
     dpl-efl
-    cert-svc-vcore
     dpl-dbus-efl
     dpl-event-efl
     dpl-utils-efl
+    wrt-popup-runner
+    security-core
+    security-client
+)
+
+
+SET(SYS_WRT_BASIC_DEP
+    openssl
+    libpcrecpp
     glib-2.0
     gthread-2.0
+    libsoup-2.4
+    libiri
+    appsvc
+    cert-svc-vcore
     edje
     ecore
     ecore-x
@@ -79,23 +89,25 @@ SET(WRT_BASIC_DEP
     elementary
     vconf
     cert-svc
-    libsoup-2.4
     ui-gadget-1
     secure-storage
-    libiri
-    appsvc
-    security-core
-    security-client
-    wrt-popup-runner
 )
 
 IF(SMACK_ENABLED)
-  LIST(APPEND WRT_BASIC_DEP libprivilege-control)
+  LIST(APPEND SYS_WRT_BASIC_DEP libprivilege-control)
 ENDIF(SMACK_ENABLED)
 
+
+
+PKG_CHECK_MODULES(SYS_WRT_ENGINE_DEPS
+    ${SYS_WRT_BASIC_DEP}
+    REQUIRED
+)
+
 PKG_CHECK_MODULES(WRT_ENGINE_DEPS
     ${WRT_BASIC_DEP}
-    REQUIRED)
+    REQUIRED
+)
 
 SET(WRT_ENGINE_INCLUDE_DIRS
     ${WRT_CORE_INCLUDES}
@@ -104,8 +116,12 @@ SET(WRT_ENGINE_INCLUDE_DIRS
 )
 
 #wrt-engine-static
+ADD_DEFINITIONS(${SYS_WRT_ENGINE_DEPS_CFLAGS})
+ADD_DEFINITIONS(${SYS_WRT_ENGINE_DEPS_CFLAGS_OTHER})
 ADD_DEFINITIONS(${WRT_ENGINE_DEPS_CFLAGS})
 ADD_DEFINITIONS(${WRT_ENGINE_DEPS_CFLAGS_OTHER})
+
+INCLUDE_DIRECTORIES(SYSTEM ${SYS_WRT_ENGINE_DEPS_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES(${WRT_ENGINE_INCLUDE_DIRS})
 
 ADD_LIBRARY(${TARGET_WRT_ENGINE_STATIC} STATIC

diff --git a/src/api_new/CMakeLists.txt b/src/api_new/CMakeLists.txt
index ebf122f..603d8c0 100644 (file)
--- a/src/api_new/CMakeLists.txt
+++ b/src/api_new/CMakeLists.txt
@@ -25,24 +25,32 @@ SET_TARGET_PROPERTIES(${TARGET_CORE_MODULE_LIB} PROPERTIES
 )
 
 PKG_CHECK_MODULES(CORE_MODULE_DEP
-    libprivilege-control
-    ewebkit2
     wrt-plugin-js-overlay
     dpl-efl
     security-wrt-ocsp
     REQUIRED
 )
 
+PKG_CHECK_MODULES(SYS_CORE_MODULE_DEP
+    ewebkit2
+    libprivilege-control
+    REQUIRED
+)
+
 INCLUDE_DIRECTORIES(
     ${CORE_MODULE_DEP_INCLUDE_DIRS}
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
+INCLUDE_DIRECTORIES( SYSTEM ${SYS_CORE_MODULE_DEP_INCLUDE_DIRS})
+
 TARGET_LINK_LIBRARIES(${TARGET_CORE_MODULE_LIB}
     ${TARGET_WRT_ENGINE_STATIC}
     ${WRT_ENGINE_DEPS_LIBRARIES}
+    ${SYS_WRT_ENGINE_DEPS_LIBRARIES}
     ${TARGET_VIEW_MODULE_LIB}
     ${CORE_MODULE_DEP_LIBRARIES}
+    ${SYS_CORE_MODULE_DEP_LIBRARIES}
 )
 
 INSTALL(TARGETS ${TARGET_CORE_MODULE_LIB}

diff --git a/src/view/common/CMakeLists.txt b/src/view/common/CMakeLists.txt
index 4fc52b5..36c6b92 100644 (file)
--- a/src/view/common/CMakeLists.txt
+++ b/src/view/common/CMakeLists.txt
@@ -18,15 +18,12 @@
 
 SET(TARGET_VIEW_COMMON_LIB_STATIC "wrt-view-common")
 
-PKG_CHECK_MODULES(VIEW_COMMON_DEP
+PKG_CHECK_MODULES(SYS_VIEW_COMMON_DEP
     appsvc
+    cert-svc-vcore
     capi-appfw-app-manager
     capi-system-haptic
     capi-web-url-download
-    cert-svc-vcore
-    dpl-efl
-    dpl-event-efl
-    dpl-wrt-dao-ro
     eina
     elementary
     evas
@@ -34,11 +31,18 @@ PKG_CHECK_MODULES(VIEW_COMMON_DEP
     libiri
     libpcrecpp
     libsoup-2.4
+    ui-gadget-1
     notification    # native notifications
     security-client
     security-core
     secure-storage
-    ui-gadget-1
+    REQUIRED
+)
+
+PKG_CHECK_MODULES(VIEW_COMMON_DEP
+    dpl-efl
+    dpl-event-efl
+    dpl-wrt-dao-ro
     wrt-commons-auto-save-dao-rw
     wrt-commons-security-origin-dao
     REQUIRED
@@ -80,6 +84,7 @@ SET(VIEW_COMMON_INCLUDES
     )
 
 INCLUDE_DIRECTORIES(${VIEW_COMMON_INCLUDES})
+INCLUDE_DIRECTORIES(SYSTEM ${SYS_VIEW_COMMON_DEP_INCLUDE_DIRS})
 
 ADD_LIBRARY(${TARGET_VIEW_COMMON_LIB_STATIC} STATIC
     ${VIEW_COMMON_SOURCES}
@@ -87,6 +92,7 @@ ADD_LIBRARY(${TARGET_VIEW_COMMON_LIB_STATIC} STATIC
 
 TARGET_LINK_LIBRARIES(${TARGET_VIEW_COMMON_LIB_STATIC}
     ${VIEW_COMMON_DEP_LIBRARIES}
+    ${SYS_VIEW_COMMON_DEP_LIBRARIES}
     ${PROF_LIB}
 )
 

diff --git a/src/view/webkit/CMakeLists.txt b/src/view/webkit/CMakeLists.txt
index 08d310e..9204f70 100644 (file)
--- a/src/view/webkit/CMakeLists.txt
+++ b/src/view/webkit/CMakeLists.txt
@@ -21,16 +21,20 @@
 include(FindPkgConfig)
 
 PKG_CHECK_MODULES(VIEW_MODULE_DEP
-    security-client
-    appsvc
     dpl-dbus-efl
     dpl-popup-efl
     dpl-utils-efl
     dpl-wrt-dao-ro
-    eina
-    ewebkit2
     wrt-plugin-js-overlay
     security-core
+    security-client
+    REQUIRED
+)
+
+PKG_CHECK_MODULES(SYS_VIEW_MODULE_DEP
+    appsvc
+    eina
+    ewebkit2
     REQUIRED
 )
 
@@ -69,6 +73,7 @@ ADD_DEFINITIONS("-DBUILDING_EFL__")
 ADD_DEFINITIONS(${VIEW_MODULE_DEP_CFLAGS})
 
 INCLUDE_DIRECTORIES(${VIEW_MODULE_INCLUDES})
+INCLUDE_DIRECTORIES(SYSTEM ${SYS_VIEW_MODULE_DEP_INCLUDE_DIRS})
 
 ADD_LIBRARY(${TARGET_VIEW_MODULE_LIB} STATIC
     ${VIEW_MODULE_SOURCES}

diff --git a/src/wrt-launcher/CMakeLists.txt b/src/wrt-launcher/CMakeLists.txt
index 5f5d773..86080b4 100644 (file)
--- a/src/wrt-launcher/CMakeLists.txt
+++ b/src/wrt-launcher/CMakeLists.txt
@@ -20,17 +20,20 @@ SET(LAUNCHER_SRCS
 )
 
 PKG_CHECK_MODULES(LAUNCHER_PKGS
-    capi-appfw-app-manager
     dpl-efl
     dpl-db-efl
     dpl-wrt-dao-rw
     dpl-wrt-dao-ro
-    REQUIRED)
+    REQUIRED
+)
 
-INCLUDE_DIRECTORIES(
-    ${LAUNCHER_PKGS_INCLUDE_DIRS}
+PKG_CHECK_MODULES(SYS_LAUNCHER_PKGS
+    capi-appfw-app-manager
+    REQUIRED
 )
 
+INCLUDE_DIRECTORIES(${LAUNCHER_PKGS_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(SYSTEM ${SYS_LAUNCHER_PKGS_INCLUDE_DIRS})
 
 ADD_EXECUTABLE(${LAUNCHER}
     ${LAUNCHER_SRCS}
@@ -38,7 +41,9 @@ ADD_EXECUTABLE(${LAUNCHER}
 
 TARGET_LINK_LIBRARIES(${LAUNCHER}
     ${LAUNCHER_PKGS_LIBRARIES}
+    ${SYS_LAUNCHER_PKGS_LIBRARIES}
     ${WRT_ENGINE_DEPS_LIBRARIES}
+    ${SYS_WRT_ENGINE_DEPS_LIBRARIES}
 )
 
 SET_TARGET_PROPERTIES(${LAUNCHER} PROPERTIES