Code Review
/
src
/
app-framework-main.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add discovery of API
[src/app-framework-main.git]
/
src
/
CMakeLists.txt
diff --git
a/src/CMakeLists.txt
b/src/CMakeLists.txt
index
dacbff2
..
b112d55
100644
(file)
--- a/
src/CMakeLists.txt
+++ b/
src/CMakeLists.txt
@@
-1,5
+1,5
@@
###########################################################################
###########################################################################
-# Copyright (C) 2015-201
8
IoT.bzh
+# Copyright (C) 2015-201
9
IoT.bzh
#
# author: José Bollo <jose.bollo@iot.bzh>
#
#
# author: José Bollo <jose.bollo@iot.bzh>
#
@@
-170,9
+170,11
@@
if(libsystemd_FOUND AND AFB_FOUND)
add_library(jbus STATIC utils-jbus.c)
add_library(jbus STATIC utils-jbus.c)
- add_executable(afm-user-daemon afm-user-daemon.c)
- target_link_libraries(afm-user-daemon jbus utils)
- install(TARGETS afm-user-daemon DESTINATION ${CMAKE_INSTALL_BINDIR})
+ if(LEGACY_USER_DAEMON)
+ add_executable(afm-user-daemon afm-user-daemon.c)
+ target_link_libraries(afm-user-daemon jbus utils)
+ install(TARGETS afm-user-daemon DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
add_library(afm-binding MODULE afm-binding.c)
target_link_libraries(afm-binding wgtpkg wgt secwrp utils afm)
add_library(afm-binding MODULE afm-binding.c)
target_link_libraries(afm-binding wgtpkg wgt secwrp utils afm)
@@
-180,10
+182,12
@@
if(libsystemd_FOUND AND AFB_FOUND)
PREFIX ""
LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/afm-binding.export-map"
)
PREFIX ""
LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/afm-binding.export-map"
)
- install(TARGETS afm-binding LIBRARY DESTINATION ${
CMAKE_INSTALL_LIBEXECDIR}/afm
)
+ install(TARGETS afm-binding LIBRARY DESTINATION ${
afm_libexecdir}
)
add_executable(afm-user-session afm-user-session.c)
add_executable(afm-user-session afm-user-session.c)
- install(TARGETS afm-user-session DESTINATION ${CMAKE_INSTALL_BINDIR} PERMISSIONS SETUID OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE)
+ install(TARGETS afm-user-session DESTINATION ${afm_libexecdir}
+ PERMISSIONS SETUID OWNER_READ OWNER_WRITE OWNER_EXECUTE
+ GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
else()
MESSAGE(STATUS "Not creating daemons")
endif()
else()
MESSAGE(STATUS "Not creating daemons")
endif()