Distinguish between system headers and project headers.
authorJan Olszak <j.olszak@samsung.com>
Fri, 16 Nov 2012 11:53:14 +0000 (12:53 +0100)
committerJan Olszak <j.olszak@samsung.com>
Tue, 20 Nov 2012 09:28:21 +0000 (10:28 +0100)
[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 commons. No warnings from system headers.

Change-Id: Ic8e35696f21da6674abc449e3ed272d07d050019

16 files changed:
3rdparty/CMakeLists.txt
CMakeLists.txt
build/core/CMakeLists.txt
build/db/CMakeLists.txt
build/dbus/CMakeLists.txt
build/encryption/CMakeLists.txt
build/event/CMakeLists.txt
build/log/CMakeLists.txt
build/popup/CMakeLists.txt
build/rpc/CMakeLists.txt
build/socket/CMakeLists.txt
build/test/CMakeLists.txt
build/utils/CMakeLists.txt
modules/auto_save_dao/CMakeLists.txt
modules/security_origin_dao/CMakeLists.txt
modules/widget_dao/CMakeLists.txt

index 4783a46..e71fc4c 100644 (file)
@@ -54,7 +54,7 @@ SET(TARGET_3RDPARTY "lib3rdparty")
 INCLUDE_DIRECTORIES(${DPL_3RDPARTY_INCLUDE_DIR})
 
 # Add system include files
-INCLUDE_DIRECTORIES(${SYS_3RDPARTY_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(SYSTEM ${SYS_3RDPARTY_INCLUDE_DIRS})
 LINK_DIRECTORIES(${SYS_3RDPARTY_LIBRARY_DIRS})
 
 # Build shared library
index fc51d8e..9a2b37d 100644 (file)
@@ -170,7 +170,6 @@ ADD_DEFINITIONS("-std=c++0x")
 SET(DPL_3RDPARTY_INCLUDE_DIR
     ${PROJECT_SOURCE_DIR}/3rdparty)
 
-
 # Set names of binaries being created
 SET(TARGET_DPL_EFL "lib${PROJECT_NAME}-efl")
 SET(TARGET_DPL_DBUS_EFL "lib${PROJECT_NAME}-dbus-efl")
index a202bdc..080d65c 100644 (file)
@@ -35,9 +35,10 @@ INCLUDE_DIRECTORIES(
     ${DPL_LOG_INCLUDE_DIR}
     ${DPL_CORE_INCLUDE_DIR}
     ${DPL_3RDPARTY_INCLUDE_DIR}
-    ${SYS_EFL_INCLUDE_DIRS}
 )
 
+INCLUDE_DIRECTORIES(SYSTEM ${SYS_EFL_INCLUDE_DIRS})
+
 LINK_DIRECTORIES(${SYS_EFL_LIBRARY_DIRS})
 
 # Base EFL based DPL library
index 6b38b87..29dd495 100644 (file)
@@ -30,7 +30,10 @@ INCLUDE_DIRECTORIES(
     ${DPL_LOG_INCLUDE_DIR}
     ${DPL_CORE_INCLUDE_DIR}
     ${DPL_DB_INCLUDE_DIR}
-    ${SYS_EFL_INCLUDE_DIRS})
+)
+
+INCLUDE_DIRECTORIES(SYSTEM ${SYS_EFL_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(SYSTEM ${SYS_EFL_DB_INCLUDE_DIRS})
 
 LINK_DIRECTORIES(
     ${SYS_EFL_DB_LIBRARY_DIRS}
index a7d0b63..59b2db1 100644 (file)
@@ -31,7 +31,10 @@ INCLUDE_DIRECTORIES(
     ${DPL_CORE_INCLUDE_DIR}
     ${DPL_DBUS_INCLUDE_DIR}
     ${DPL_EVENT_INCLUDE_DIR}
-    ${SYS_EFL_INCLUDE_DIRS})
+)
+
+INCLUDE_DIRECTORIES(SYSTEM ${SYS_EFL_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(SYSTEM ${SYS_EFL_DBUS_INCLUDE_DIRS})
 
 LINK_DIRECTORIES(
     ${SYS_EFL_DBUS_LIBRARY_DIRS}
index 7994b27..710ada6 100644 (file)
@@ -31,10 +31,11 @@ INCLUDE_DIRECTORIES(
     ${DPL_LOG_INCLUDE_DIR}
     ${DPL_CORE_INCLUDE_DIR}
     ${DPL_DB_INCLUDE_DIR}
-    ${SYS_ENCRYPTION_INCLUDE_DIRS}
     ${DPL_ENCRYPTION_INCLUDE_DIR}
 )
 
+INCLUDE_DIRECTORIES(SYSTEM ${SYS_ENCRYPTION_INCLUDE_DIRS})
+
 LINK_DIRECTORIES(
     ${SYS_ENCRYPTION_LIBRARY_DIRS}
 )
index 1d18619..b023e0a 100644 (file)
@@ -32,7 +32,10 @@ INCLUDE_DIRECTORIES(
     ${DPL_LOG_INCLUDE_DIR}
     ${DPL_CORE_INCLUDE_DIR}
     ${DPL_EVENT_INCLUDE_DIR}
-    ${SYS_EFL_EVENT_INCLUDE_DIRS})
+    ${DPL_EVENT_INCLUDE_DIR}
+)
+
+INCLUDE_DIRECTORIES(SYSTEM ${SYS_EFL_EVENT_INCLUDE_DIRS})
 
 LINK_DIRECTORIES(
     ${SYS_EFL_EVENT_LIBRARY_DIRS}
index 762f479..47379d5 100644 (file)
@@ -28,9 +28,10 @@ PKG_CHECK_MODULES(SYS_EFL_LOG
 # Add core include directories
 INCLUDE_DIRECTORIES(
     ${DPL_LOG_INCLUDE_DIR}
-    ${SYS_EFL_LOG_INCLUDE_DIRS}
 )
 
+INCLUDE_DIRECTORIES(SYSTEM ${SYS_EFL_LOG_INCLUDE_DIRS})
+
 LINK_DIRECTORIES(
     ${SYS_EFL_LOG_LIBRARY_DIRS}
 )
index efb25aa..07425a3 100644 (file)
@@ -30,7 +30,10 @@ INCLUDE_DIRECTORIES(
     ${DPL_CORE_INCLUDE_DIR}
     ${DPL_POPUP_INCLUDE_DIR}
     ${DPL_EVENT_INCLUDE_DIR}
-    ${SYS_EFL_INCLUDE_DIRS})
+)
+
+INCLUDE_DIRECTORIES(SYSTEM ${SYS_EFL_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(SYSTEM ${SYS_POPUP_INCLUDE_DIRS})
 
 LINK_DIRECTORIES(
     ${SYS_POPUP_LIBRARY_DIRS}
index a782141..9c52217 100644 (file)
@@ -1,3 +1,4 @@
+
 # Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
@@ -33,9 +34,10 @@ INCLUDE_DIRECTORIES(
     ${DPL_SOCKET_INCLUDE_DIR}
     ${DPL_EVENT_INCLUDE_DIR}
     ${DPL_RPC_INCLUDE_DIR}
-    ${SYS_EFL_RPC_INCLUDE_DIRS}
 )
 
+INCLUDE_DIRECTORIES(SYSTEM ${SYS_EFL_RPC_INCLUDE_DIRS})
+
 LINK_DIRECTORIES(
     ${SYS_EFL_RPC_LIBRARY_DIRS}
 )
index d6198e3..3ef033f 100644 (file)
@@ -32,9 +32,10 @@ INCLUDE_DIRECTORIES(
     ${DPL_CORE_INCLUDE_DIR}
     ${DPL_SOCKET_INCLUDE_DIR}
     ${DPL_EVENT_INCLUDE_DIR}
-    ${SYS_EFL_SOCKET_INCLUDE_DIRS}
 )
 
+INCLUDE_DIRECTORIES(SYSTEM ${SYS_EFL_SOCKET_INCLUDE_DIRS})
+
 LINK_DIRECTORIES(
     ${SYS_EFL_SOCKET_LIBRARY_DIRS}
 )
index 52fee02..710fc4e 100644 (file)
@@ -30,9 +30,10 @@ INCLUDE_DIRECTORIES(
     ${DPL_CORE_INCLUDE_DIR}
     ${DPL_TEST_ENGINE_INCLUDE_DIR}
     ${DPL_UTILS_INCLUDE_DIR}
-    ${SYS_EFL_TEST_ENGINE_INCLUDE_DIRS}
 )
 
+INCLUDE_DIRECTORIES(SYSTEM ${SYS_EFL_TEST_ENGINE_INCLUDE_DIRS})
+
 LINK_DIRECTORIES(
     ${SYS_EFL_TEST_ENGINE_LIBRARY_DIRS}
 )
index 3e006ee..ccc52ae 100644 (file)
@@ -33,10 +33,10 @@ INCLUDE_DIRECTORIES(
     ${DPL_LOG_INCLUDE_DIR}
     ${DPL_CORE_INCLUDE_DIR}
     ${DPL_DB_INCLUDE_DIR}
-    ${SYS_EFL_UTILS_INCLUDE_DIRS}
     ${DPL_UTILS_INCLUDE_DIR}
     ${DPL_LOCALIZATION_INCLUDE_DIR}
 )
+INCLUDE_DIRECTORIES(SYSTEM ${SYS_EFL_UTILS_INCLUDE_DIRS})
 
 INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/modules/widget_dao/include)
 INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/modules/vcore/src/vcore)
index 8685d57..f137c60 100644 (file)
@@ -37,9 +37,9 @@ SET(AUTO_SAVE_DAO_INCLUDE_DIRS
     ${PROJECT_SOURCE_DIR}/modules/core/include
     ${PROJECT_SOURCE_DIR}/modules/db/include
     ${PROJECT_SOURCE_DIR}/modules/log/include
-    ${AUTO_SAVE_DAO_DEPS_INCLUDE_DIRS}
 )
 
+
 SET(AUTO_SAVE_DAO_SOURCES
     dao/common_dao_types.cpp
     dao/AutoSaveDatabase.cpp
@@ -53,7 +53,9 @@ SET(AUTO_SAVE_DAO_RW_SOURCES
     dao/auto_save_dao.cpp
 )
 
+
 INCLUDE_DIRECTORIES(${AUTO_SAVE_DAO_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(SYSTEM ${AUTO_SAVE_DAO_DEPS_INCLUDE_DIRS})
 
 ADD_LIBRARY(${TARGET_AUTO_SAVE_DAO_LIB} SHARED ${AUTO_SAVE_DAO_SOURCES})
 SET_TARGET_PROPERTIES(${TARGET_AUTO_SAVE_DAO_LIB} PROPERTIES SOVERSION ${API_VERSION} VERSION ${VERSION})
index f2a37da..161aa6b 100644 (file)
@@ -28,7 +28,6 @@ SET(SECURITY_ORIGIN_DAO_INCLUDE_DIRS
     ${PROJECT_SOURCE_DIR}/modules/db/include
     ${PROJECT_SOURCE_DIR}/modules/log/include
     ${PROJECT_SOURCE_DIR}/modules/widget_dao/include
-    ${SECURITY_ORIGIN_DAO_DEPS_INCLUDE_DIRS}
 )
 
 SET(SECURITY_ORIGIN_DAO_SOURCES
@@ -37,6 +36,7 @@ SET(SECURITY_ORIGIN_DAO_SOURCES
     dao/security_origin_dao.cpp
 )
 
+INCLUDE_DIRECTORIES(SYSTEM ${SECURITY_ORIGIN_DAO_DEPS_INCLUDE_DIRS} )
 INCLUDE_DIRECTORIES(${SECURITY_ORIGIN_DAO_INCLUDE_DIRS})
 
 ADD_LIBRARY(${TARGET_SECURITY_ORIGIN_DAO_LIB} SHARED ${SECURITY_ORIGIN_DAO_SOURCES})
index c6f7057..6ef3765 100644 (file)
@@ -68,10 +68,10 @@ SET(WRT_DAO_INCLUDE_DIRS
     ${PROJECT_SOURCE_DIR}/modules/db/include
     ${PROJECT_SOURCE_DIR}/modules/log/include
     ${PROJECT_SOURCE_DIR}/modules/localization/include
-    ${WRT_DAO_DEPS_INCLUDE_DIRS}
-    )
+)
 
 INCLUDE_DIRECTORIES(${WRT_DAO_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(SYSTEM ${WRT_DAO_DEPS_INCLUDE_DIRS})
 
 ADD_LIBRARY(${TARGET_WRT_DAO_RO_LIB} SHARED
             ${WRT_DAO_RO_SOURCES}