From c8fdd34370f5f0929cb1e531641ed93dbc7e5ae8 Mon Sep 17 00:00:00 2001
From: Alexander Neundorf <neundorf@kde.org>
Date: Sat, 16 Aug 2008 15:26:55 +0000
Subject: don't override BUILD_<dir> with the DISABLE_ALL master switch

Alex



svn path=/trunk/KDE/kdelibs/; revision=848008
---
 modules/MacroOptionalAddSubdirectory.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/MacroOptionalAddSubdirectory.cmake')

diff --git a/modules/MacroOptionalAddSubdirectory.cmake b/modules/MacroOptionalAddSubdirectory.cmake
index 9566bb4c..32e25141 100644
--- a/modules/MacroOptionalAddSubdirectory.cmake
+++ b/modules/MacroOptionalAddSubdirectory.cmake
@@ -20,9 +20,9 @@ MACRO (MACRO_OPTIONAL_ADD_SUBDIRECTORY _dir )
    GET_FILENAME_COMPONENT(_fullPath ${_dir} ABSOLUTE)
    IF(EXISTS ${_fullPath})
       SET(_DEFAULT_OPTION_VALUE TRUE)
-      IF(DISABLE_ALL_OPTIONAL_SUBDIRS)
+      IF(DISABLE_ALL_OPTIONAL_SUBDIRS  AND NOT DEFINED  BUILD_${_dir})
          SET(_DEFAULT_OPTION_VALUE FALSE)
-      ENDIF(DISABLE_ALL_OPTIONAL_SUBDIRS)
+      ENDIF(DISABLE_ALL_OPTIONAL_SUBDIRS  AND NOT DEFINED  BUILD_${_dir})
       OPTION(BUILD_${_dir} "Build directory ${_dir}" ${_DEFAULT_OPTION_VALUE})
       IF(BUILD_${_dir})
          ADD_SUBDIRECTORY(${_dir})
-- 
cgit v1.2.1