From 6cd7467fbe20534d26440b4c374ff960efbdf835 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Sun, 28 May 2017 13:02:09 +0200 Subject: [PATCH] Fix:use first optional argument in adding subdir macro Change-Id: Id09128836df86ade96036359e125e4ce4f23a124 Signed-off-by: Romain Forlot --- cmake/common.cmake | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cmake/common.cmake b/cmake/common.cmake index a78d246..9904692 100644 --- a/cmake/common.cmake +++ b/cmake/common.cmake @@ -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") -- 2.16.6