Rename source files and improve readability

[src/app-framework-main.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dacbff2..3a94d0d 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 ###########################################################################
-# Copyright (C) 2015-2018 IoT.bzh
+# Copyright (C) 2015-2020 IoT.bzh
 #
 # author: José Bollo <jose.bollo@iot.bzh>
 #
@@ -148,19 +148,19 @@ add_library(afm STATIC
 
 MESSAGE(STATUS "Creating packaging tools")
 
-add_executable(wgtpkg-sign wgtpkg-sign.c)
+add_executable(wgtpkg-sign main-wgtpkg-sign.c)
 target_link_libraries(wgtpkg-sign wgtpkg utils)
 
-add_executable(wgtpkg-pack wgtpkg-pack.c)
+add_executable(wgtpkg-pack main-wgtpkg-pack.c)
 target_link_libraries(wgtpkg-pack wgtpkg utils)
 
-add_executable(wgtpkg-info wgtpkg-info.c)
+add_executable(wgtpkg-info main-wgtpkg-info.c)
 target_link_libraries(wgtpkg-info wgtpkg wgt utils)
 
-add_executable(wgtpkg-installer wgtpkg-installer.c)
-target_link_libraries(wgtpkg-installer wgtpkg wgt secwrp utils)
+add_executable(wgtpkg-install main-wgtpkg-install.c)
+target_link_libraries(wgtpkg-install wgtpkg wgt secwrp utils)
 
-install(TARGETS wgtpkg-sign wgtpkg-pack wgtpkg-info wgtpkg-installer DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(TARGETS wgtpkg-sign wgtpkg-pack wgtpkg-info wgtpkg-install DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 ###########################################################################
 # dynamic tool daemons
@@ -170,9 +170,11 @@ if(libsystemd_FOUND AND AFB_FOUND)
 
        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)
@@ -180,10 +182,12 @@ if(libsystemd_FOUND AND AFB_FOUND)
                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)
-       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()