[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase
From:       David Faure <faure () kde ! org>
Date:       2006-04-12 11:52:18
Message-ID: 1144842738.760727.24392.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 529011 by dfaure:

Use KDE4Defaults to reduce duplication.
Fix logic for workspace: for x11-on-mac it should be compiled, just not for native-macosx.


 M  +4 -15     CMakeLists.txt  


--- trunk/KDE/kdebase/CMakeLists.txt #529010:529011
@@ -5,20 +5,9 @@
 # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
 
-# support for Dart: http://public.kitware.com/dashboard.php?name=kde
-enable_testing()
-include(CTest)
-
-# Always include srcdir and builddir in include path
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-# Use colors
-set(CMAKE_COLOR_MAKEFILE ON)
-
 # search packages used by KDE
 find_package(KDE4 REQUIRED)
-
-
+include(KDE4Defaults)
 find_package(Perl REQUIRED)
 find_package(ZLIB REQUIRED)
 
@@ -58,10 +47,10 @@
 add_subdirectory( kdepasswd )
 add_subdirectory( kdeprint )
 
-if ( UNIX )
-if ( NOT APPLE )
+if ( Q_WS_X11 )
    add_subdirectory( workspace )
-endif ( NOT APPLE )
+endif ( Q_WS_X11 )
+if ( UNIX )
    add_subdirectory( kdesu )
 endif ( UNIX )
 
[prev in list] [next in list] [prev in thread] [next in thread]