Fix:use first optional argument in adding subdir macro
authorRomain Forlot <romain.forlot@iot.bzh>
Sun, 28 May 2017 11:02:09 +0000 (13:02 +0200)
committerRomain Forlot <romain.forlot@iot.bzh>
Sun, 28 May 2017 11:02:09 +0000 (13:02 +0200)
Change-Id: Id09128836df86ade96036359e125e4ce4f23a124
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
cmake/common.cmake

index a78d246..9904692 100644 (file)
@@ -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")