Adding LANGUAGES to the project. Better compiler version detection

[staging/xdg-launcher.git] / reference / etc / macros.cmake

diff --git a/reference/etc/macros.cmake b/reference/etc/macros.cmake
index 046be7a..72f55f0 100644 (file)
--- a/reference/etc/macros.cmake
+++ b/reference/etc/macros.cmake
@@ -112,7 +112,12 @@ macro(project_package_build)
 endmacro(project_package_build)
 
 macro(project_subdirs_add)
-       file(GLOB filelist "*")
+       if(${ARGV0})
+               file(GLOB filelist "${ARGV0}")
+       else()
+               file(GLOB filelist "*")
+       endif(${ARGV0})
+
        foreach(filename ${filelist})
                if(EXISTS "${filename}/CMakeLists.txt")
                        add_subdirectory(${filename})
@@ -126,7 +131,7 @@ set(CMP0048 1)
 
 # Include project configuration
 # ------------------------------
-project(${NAME} VERSION ${VERSION})
+project(${PROJECT_NAME} VERSION ${PROJECT_VERSION} LANGUAGES ${PROJECT_LANGUAGES})
 set(PROJECT_WGT_DIR "packaging/wgt" CACHE PATH "Subpath to the widget directory")
 set(PROJECT_LIBDIR "libs" CACHE PATH "Subpath to libraries")
 set(PROJECT_RESOURCES "data" CACHE PATH "Subpath to data")