3 files changed, 25 insertions, 29 deletions
diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
index b8d065b..b600684 100644
--- a/bin/CMakeLists.txt
+++ b/bin/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.6)
 
 add_library(ringbuffer
             ${CMAKE_CURRENT_SOURCE_DIR}/common/ring-buffer.c)
@@ -7,4 +7,3 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/common)
 
 add_subdirectory(gui)
 add_subdirectory(tools)
-
diff --git a/bin/gui/CMakeLists.txt b/bin/gui/CMakeLists.txt
index c42bf35..bb5a8f4 100644
--- a/bin/gui/CMakeLists.txt
+++ b/bin/gui/CMakeLists.txt
@@ -1,8 +1,6 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.6)
 
-add_definitions("--std=c99 -Wall")
-
-# --- Find packages and libraries ---------------------------------------------
+#{{{ Configure
 find_package(PkgConfig)
 
 pkg_check_modules(GTK2 gtk+-2.0>=2.22)
@@ -13,12 +11,11 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/control.glade
                ${CMAKE_CURRENT_BINARY_DIR})
-
-# --- Build targets -----------------------------------------------------------
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
+#}}}
+#{{{ Target
 if (GTK2_FOUND)
-    include_directories(${GTK2_INCLUDE_DIRS})
+    include_directories(${GTK2_INCLUDE_DIRS}
+                        ${CMAKE_CURRENT_BINARY_DIR})
     set(BINARY "uca-camera-control")
 
     add_executable(${BINARY}
@@ -31,7 +28,7 @@ if (GTK2_FOUND)
         m
         uca
         ringbuffer
-        ${GTK2_LIBRARIES} 
+        ${GTK2_LIBRARIES}
         ${GTHREAD2_LIBRARIES})
 
     install(TARGETS ${BINARY}
@@ -40,3 +37,4 @@ if (GTK2_FOUND)
     install(FILES control.glade
         DESTINATION share/libuca)
 endif()
+#}}}
diff --git a/bin/tools/CMakeLists.txt b/bin/tools/CMakeLists.txt
index 2bec9c9..285b2d7 100644
--- a/bin/tools/CMakeLists.txt
+++ b/bin/tools/CMakeLists.txt
@@ -1,17 +1,10 @@
-cmake_minimum_required(VERSION 2.8)
-
-add_definitions("--std=c99 -Wall")
-
-# --- Find packages and libraries ---------------------------------------------
-find_package(TIFF)
-
-# --- Build targets -----------------------------------------------------------
-include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    )
+cmake_minimum_required(VERSION 2.6)
 
+#{{{ Variables
 set(libs uca)
+#}}}
+#{{{ Configure
+find_package(TIFF)
 
 if (TIFF_FOUND)
     set(HAVE_LIBTIFF "1")
@@ -21,20 +14,26 @@ endif ()
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
                ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+#}}}
+#{{{ Targets
+include_directories(${CMAKE_CURRENT_BINARY_DIR}
+                    ${CMAKE_CURRENT_SOURCE_DIR})
 
-# --- gen-doc
+#{{{ gen-doc
 add_executable(uca-gen-doc gen-doc.c)
 target_link_libraries(uca-gen-doc ${libs})
-
-# --- uca-grab
+#}}}
+#{{{ uca-grab
 add_executable(uca-grab
                grab.c common.c)
 target_link_libraries(uca-grab ringbuffer ${libs})
-
-# --- uca-benchmark
+#}}}
+#{{{ uca-benchmark
 add_executable(uca-benchmark
                benchmark.c common.c)
 target_link_libraries(uca-benchmark ${libs})
 
 install(TARGETS uca-benchmark uca-grab uca-gen-doc
         RUNTIME DESTINATION bin)
+#}}}
+#}}}