--- a/CMakeLists.txt	Fri Jul 09 20:24:24 2010 +0100
+++ b/CMakeLists.txt	Sat Jul 10 21:54:44 2010 +0100
@@ -51,7 +51,7 @@
 set(GENERATE_DI_FILES OFF) ## Very experimental option. Temporarily disabled.
 option(VERBOSE_DEBUG "Verbose debug" "OFF")
 
-set(all_packages Core Gui OpenGL Xml Svg Network WebKit CACHE INTERNAL "")
+set(all_packages Core Gui OpenGL Xml Svg Network WebKit Qwt CACHE INTERNAL "")
 
 ## Init D toolkit.
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
@@ -93,12 +93,30 @@
 foreach(package_big ${all_packages})
     string(TOLOWER ${package_big} package)
     string(TOUPPER ${package_big} package_upper)
-    option(BUILD_QT_${package_upper} "Build Qt${package_big}" "ON")
+    set(package_default_option "ON")
+    if(${package_big} STREQUAL "Qwt")
+        set(package_default_option "OFF")
+    endif()
+    option(BUILD_QT_${package_upper} "Build Qt${package_big}" ${package_default_option})
     if(BUILD_QT_${package_upper})
         set(packages ${packages} ${package_big})
     endif()
 endforeach()
 
+set(QWT_INCLUDE_PATH "/usr/include/qwt-qt4" CACHE STRING "Qwt include path")
+
+set(inc_paths "")
+
+if(CMAKE_HOST_WIN32)
+    set(sep ";")
+else()
+    set(sep ":")
+endif()
+
+if(BUILD_QT_QWT)
+    set(inc_paths ${inc_paths}${sep}${QWT_INCLUDE_PATH})
+endif()
+
 add_subdirectory(generator)
 
 add_custom_target(main ALL)
@@ -151,6 +169,9 @@
 math(EXPR QTD_VERSION "(${QT_VERSION_MAJOR} << 16) + (${QT_VERSION_MINOR} << 8) + ${QT_VERSION_PATCH}")
 
 include_directories(${QT_INCLUDES} ${CMAKE_SOURCE_DIR}/include ${CMAKE_CURRENT_BINARY_DIR}/include)
+if(${BUILD_QT_QWT})
+    include_directories(${QWT_INCLUDE_PATH})
+endif()
 
 # System specifc settings.
 if(CMAKE_HOST_WIN32)
@@ -342,30 +363,30 @@
 
     set(all_req_found 1)
     if(BUILD_QT_${package_upper})
-    foreach(req ${required})
-        set(req_found)
-        foreach(pack ${packages_big})
-        if(${pack} STREQUAL ${req})
-            set(req_found 1)
-        endif()
-        endforeach(pack ${packages})
-        if(NOT req_found)
+        foreach(req ${required})
             set(req_found)
-            foreach(pack ${all_packages})
-                if(${pack} STREQUAL ${req})
-                    set(req_found 1)
-                endif(${pack} STREQUAL ${req})
-            endforeach(pack ${all_packages})
-            if(req_found)
-                message(STATUS "Package '${package_big}' requires '${req}', but it is not active")
-            else()
-                message(STATUS "Package '${package_big}' requires '${req}', but it is not found")
+            foreach(pack ${packages_big})
+            if(${pack} STREQUAL ${req})
+                set(req_found 1)
             endif()
-            set(all_req_found)
-        endif()
-    endforeach(req ${required})
+            endforeach(pack ${packages})
+            if(NOT req_found)
+                set(req_found)
+                foreach(pack ${all_packages})
+                    if(${pack} STREQUAL ${req})
+                        set(req_found 1)
+                    endif(${pack} STREQUAL ${req})
+                endforeach(pack ${all_packages})
+                if(req_found)
+                    message(STATUS "Package '${package_big}' requires '${req}', but it is not active")
+                else()
+                    message(STATUS "Package '${package_big}' requires '${req}', but it is not found")
+                endif()
+                set(all_req_found)
+            endif()
+        endforeach(req ${required})
     else(BUILD_QT_${package_upper})
-    set(all_req_found)
+        set(all_req_found)
     endif(BUILD_QT_${package_upper})
 
     if("${all_req_found}" EQUAL 1)