projects
/
platform
/
framework
/
native
/
appfw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Update deprecated libprivilege-control API functions." into tizen
[platform/framework/native/appfw.git]
/
src
/
CMakeLists.txt
diff --git
a/src/CMakeLists.txt
b/src/CMakeLists.txt
index
17baaec
..
161d6a1
100644
(file)
--- a/
src/CMakeLists.txt
+++ b/
src/CMakeLists.txt
@@
-2,6
+2,7
@@
INCLUDE(FindPkgConfig)
pkg_check_modules(pkgs REQUIRED
alarm-service
INCLUDE(FindPkgConfig)
pkg_check_modules(pkgs REQUIRED
alarm-service
+ appinfo
aul
appsvc
bundle
aul
appsvc
bundle
@@
-14,9
+15,8
@@
pkg_check_modules(pkgs REQUIRED
ecore
glib-2.0
haptic
ecore
glib-2.0
haptic
- heynoti
- badge
icu-i18n
icu-i18n
+ iniparser
libpcre
libsoup-2.4
libxml-2.0
libpcre
libsoup-2.4
libxml-2.0
@@
-40,6
+40,7
@@
pkg_check_modules(pkgs REQUIRED
capi-system-system-settings
capi-system-info
security-server
capi-system-system-settings
capi-system-info
security-server
+ libprivilege-control
)
FOREACH(flag ${pkgs_CFLAGS})
)
FOREACH(flag ${pkgs_CFLAGS})
@@
-47,7
+48,6
@@
FOREACH(flag ${pkgs_CFLAGS})
ENDFOREACH(flag)
## Add SubModules
ENDFOREACH(flag)
## Add SubModules
-ADD_SUBDIRECTORY(newlib-compat)
ADD_SUBDIRECTORY(app)
ADD_SUBDIRECTORY(io)
ADD_SUBDIRECTORY(base)
ADD_SUBDIRECTORY(app)
ADD_SUBDIRECTORY(io)
ADD_SUBDIRECTORY(base)
@@
-58,6
+58,5
@@
ADD_SUBDIRECTORY(system)
ADD_SUBDIRECTORY(text)
ADD_SUBDIRECTORY(appfw)
ADD_SUBDIRECTORY(osp-string)
ADD_SUBDIRECTORY(text)
ADD_SUBDIRECTORY(appfw)
ADD_SUBDIRECTORY(osp-string)
-ADD_SUBDIRECTORY(server osp-appfw-server)
-ADD_SUBDIRECTORY(system-server osp-system-server)
-
+ADD_SUBDIRECTORY(server)
+ADD_SUBDIRECTORY(server/system osp-system-server)