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

List:       kde-commits
Subject:    KDE/kdepim
From:       Christophe Giboudeaux <cgiboudeaux () gmail ! com>
Date:       2010-12-10 12:17:05
Message-ID: 20101210121705.250A9AC8A6 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1205196 by cgiboudeaux:

KDEPIM_BUILD_MOBILE and KDEPIM_BUILD_EVERYTHING can live together.KNode is now built \
again when KDEPIM_MOBILE_UI is true

 M  +8 -6      CMakeLists.txt  


--- trunk/KDE/kdepim/CMakeLists.txt #1205195:1205196
@@ -38,6 +38,10 @@
     add_definitions(-DKDEPIM_STATIC_LIBS)
 endif(WINCE)
 
+
+# Default
+set(KDEPIM_BUILD_EVERYTHING TRUE)
+
 # if KDEPIM_ENTERPRISE_BUILD is defined, KDEPIM_ONLY_KLEO is disabled
 # FIXME build the mobile applications ?
 if(KDEPIM_ENTERPRISE_BUILD)
@@ -52,15 +56,13 @@
     set(KDEPIM_MOBILE_UI FALSE)
     set(KDEPIM_DEFINITIONS "-DHAVE_CONFIG_H=1")
     message(STATUS "Only libkleo and Kleopatra will be built.")
-  elseif(KDEPIM_MOBILE_UI)
+  endif()
+endif()
+
+if(KDEPIM_MOBILE_UI)
     # Build the mobile applications
     set(KDEPIM_BUILD_MOBILE TRUE)
-  else()
-    # Default
-    set(KDEPIM_BUILD_EVERYTHING TRUE)
-    message(STATUS "Enterprise build is disabled.")
   endif()
-endif()
 
 # config-enterprise.h is needed for both ENTERPRISE_BUILD and BUILD_EVERYTHING
 configure_file(config-enterprise.h.cmake \
${CMAKE_CURRENT_BINARY_DIR}/config-enterprise.h )


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