From 52480798b223873f585937940a0083ca463ad47a Mon Sep 17 00:00:00 2001 From: Jonathan Marten Date: Fri, 5 Mar 2010 08:41:10 +0000 Subject: Allow macro_optional_add_subdirectory to work with CMake 2.8 in the case where a directory exists but is empty, by checking that it contains a CMakeLists.txt file before adding it. OK from kde-buildsystem list at http://lists.kde.org/?t=126772053200003&r=1&w=2 svn path=/trunk/KDE/kdelibs/; revision=1099212 --- modules/MacroOptionalAddSubdirectory.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules') diff --git a/modules/MacroOptionalAddSubdirectory.cmake b/modules/MacroOptionalAddSubdirectory.cmake index 5de49f95..ec0ea30a 100644 --- a/modules/MacroOptionalAddSubdirectory.cmake +++ b/modules/MacroOptionalAddSubdirectory.cmake @@ -24,7 +24,7 @@ MACRO (MACRO_OPTIONAL_ADD_SUBDIRECTORY _dir ) GET_FILENAME_COMPONENT(_fullPath ${_dir} ABSOLUTE) - IF(EXISTS ${_fullPath}) + IF(EXISTS ${_fullPath}/CMakeLists.txt) IF(DISABLE_ALL_OPTIONAL_SUBDIRECTORIES) SET(_DEFAULT_OPTION_VALUE FALSE) ELSE(DISABLE_ALL_OPTIONAL_SUBDIRECTORIES) @@ -37,5 +37,5 @@ MACRO (MACRO_OPTIONAL_ADD_SUBDIRECTORY _dir ) IF(BUILD_${_dir}) ADD_SUBDIRECTORY(${_dir}) ENDIF(BUILD_${_dir}) - ENDIF(EXISTS ${_fullPath}) + ENDIF(EXISTS ${_fullPath}/CMakeLists.txt) ENDMACRO (MACRO_OPTIONAL_ADD_SUBDIRECTORY) -- cgit v1.2.1