Adding colors in output messages.

[staging/xdg-launcher.git] / cmake / common.cmake

diff --git a/cmake/common.cmake b/cmake/common.cmake
index 12ef8e8..afc8ce0 100644 (file)
--- a/cmake/common.cmake
+++ b/cmake/common.cmake
@@ -155,9 +155,9 @@ macro(remote_targets_populate)
        )
 
        if(NOT RSYNC_TARGET OR NOT RSYNC_PREFIX)
-               message (".. Warning: RSYNC_TARGET RSYNC_PREFIX not defined 'make remote-target-populate' not instanciated")
+               message ("${Yellow}.. Warning: RSYNC_TARGET RSYNC_PREFIX not defined 'make remote-target-populate' not instanciated${ColourReset}")
                add_custom_target(remote-target-populate
-                       COMMENT "*** Fatal: RSYNC_TARGET RSYNC_PREFIX required with 'make remote-target-populate'"
+                       COMMENT "${Red}*** Fatal: RSYNC_TARGET RSYNC_PREFIX environment variables required with 'make remote-target-populate'${ColourReset}"
                        COMMAND exit -1
                )
        else()
@@ -168,7 +168,7 @@ macro(remote_targets_populate)
                add_custom_target(remote-target-populate
                        DEPENDS populate
                        COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/target/start-on-${RSYNC_TARGET}.sh
-                       COMMAND rsync --archive --delete ${PROJECT_PKG_DIR}/ ${RSYNC_TARGET}:${RSYNC_PREFIX}/${PROJECT_NAME}
+                       COMMAND rsync --archive --delete ${PROJECT_PKG_BUILD_DIR}/ ${RSYNC_TARGET}:${RSYNC_PREFIX}/${PROJECT_NAME}
                        COMMENT "${REMOTE_LAUNCH}"
                )
        endif()
@@ -253,11 +253,13 @@ macro(project_package_build)
 endmacro(project_package_build)
 
 macro(project_subdirs_add)
-       if(${ARGV0})
+       set (ARGSLIST ${ARGN})
+       list(LENGTH ARGSLIST ARGSNUM)
+       if(${ARGSNUM} GREATER 0)
                file(GLOB filelist "${ARGV0}")
        else()
-               file(GLOB filelist "*")
-       endif(${ARGV0})
+       file(GLOB filelist "*")
+       endif()
 
        foreach(filename ${filelist})
                if(EXISTS "${filename}/CMakeLists.txt")
@@ -346,7 +348,7 @@ else()
 endif()
 set(PROJECT_PKG_ENTRY_POINT ${CMAKE_SOURCE_DIR}/packaging CACHE PATH "Where package build files, like rpm.spec file or config.xml, are write.")
 
-set (PKG_TEMPLATE_PREFIX ${CMAKE_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/default CACHE PATH "Default Package Templates Directory")
+set (PKG_TEMPLATE_PREFIX ${CMAKE_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR} CACHE PATH "Default Package Templates Directory")
 set(SSH_TEMPLATE_DIR ${PKG_TEMPLATE_PREFIX}/ssh)
 set(GDB_TEMPLATE_DIR ${PKG_TEMPLATE_PREFIX}/gdb)
 set(TEMPLATE_WGT_DIR "${PKG_TEMPLATE_PREFIX}/wgt" CACHE PATH "Subpath to a directory where are stored needed files to build widget")
@@ -355,7 +357,7 @@ set(TEMPLATE_DEB_DIR "${PKG_TEMPLATE_PREFIX}/deb" CACHE PATH "Subpath to a direc
 
 # Default Linkflag
 if(NOT BINDINGS_LINK_FLAG)
-       set(BINDINGS_LINK_FLAG "-Wl,--version-script=${CMAKE_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/default/cmake/export.map")
+       set(BINDINGS_LINK_FLAG "-Wl,--version-script=${CMAKE_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/cmake/export.map")
 endif()
 
 # Add a dummy target to enable global dependency order