--- a/.hgignore	Mon Aug 15 11:39:25 2011 -0400
+++ b/.hgignore	Mon Aug 15 11:56:34 2011 -0400
@@ -15,7 +15,12 @@
 *.yml
 *.zip
 .emacs.desktop*
+
+CMakeCache.txt
+*.cmake
+
 latex
 html
 bin
-build
\ No newline at end of file
+build
+CMakeFiles
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/CMakeLists.txt	Mon Aug 15 11:56:34 2011 -0400
@@ -0,0 +1,32 @@
+CMAKE_MINIMUM_REQUIRED( VERSION 2.6 )
+
+FIND_PACKAGE(
+	OpenCV REQUIRED
+)
+
+FIND_LIBRARY(
+	SQLite3_LIBS sqlite3
+)
+
+#FIND_PACKAGE(TrajectoryManagement)
+
+SET(
+	CMAKE_CXX_FLAGS "-g -Wall"
+)
+
+ADD_EXECUTABLE(
+  bin/feature-based-tracking
+  c/feature-based-tracking.cpp
+  )
+
+INCLUDE_DIRECTORIES(
+#  bin/feature-based-tracking
+/home/nicolas/Research/Code/trajectorymanagementandanalysis/trunk/src/TrajectoryManagementAndAnalysis
+)
+
+#TARGET_LINK_LIBRARIES(
+#  bin/feature-based-tracking
+#  ${OpenCV_LIBS}
+#  $(TrajectoryManagement_DIR)
+  #	${SQLite3_LIBS}
+#  )

--- a/Makefile	Mon Aug 15 11:39:25 2011 -0400
+++ b/Makefile	Mon Aug 15 11:56:34 2011 -0400
@@ -1,12 +1,163 @@
-# put test for platform
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
+
+# Default target executed when no arguments are given to make.
+default_target: all
+.PHONY : default_target
+
+#=============================================================================
+# Special targets provided by cmake.
+
+# Disable implicit rules so canoncical targets will work.
+.SUFFIXES:
+
+# Remove some rules from gmake that .SUFFIXES does not remove.
+SUFFIXES =
+
+.SUFFIXES: .hpux_make_needs_suffix_list
+
+# Suppress display of executed commands.
+$(VERBOSE).SILENT:
+
+# A target that is always out of date.
+cmake_force:
+.PHONY : cmake_force
+
+#=============================================================================
+# Set environment variables for the build.
+
+# The shell in which to execute make rules.
+SHELL = /bin/sh
+
+# The CMake executable.
+CMAKE_COMMAND = /usr/bin/cmake
+
+# The command to remove a file.
+RM = /usr/bin/cmake -E remove -f
+
+# The program to use to edit the cache.
+CMAKE_EDIT_COMMAND = /usr/bin/ccmake
 
-INCLUDE=./include
+# The top-level source directory on which CMake was run.
+CMAKE_SOURCE_DIR = /home/nicolas/Research/Code/traffic-intelligence
+
+# The top-level build directory on which CMake was run.
+CMAKE_BINARY_DIR = /home/nicolas/Research/Code/traffic-intelligence
+
+#=============================================================================
+# Targets provided globally by CMake.
+
+# Special rule for the target edit_cache
+edit_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
+	/usr/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : edit_cache
+
+# Special rule for the target edit_cache
+edit_cache/fast: edit_cache
+.PHONY : edit_cache/fast
+
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
+
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
+
+# The main all target
+all: cmake_check_build_system
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/nicolas/Research/Code/traffic-intelligence/CMakeFiles /home/nicolas/Research/Code/traffic-intelligence/CMakeFiles/progress.marks
+	$(MAKE) -f CMakeFiles/Makefile2 all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/nicolas/Research/Code/traffic-intelligence/CMakeFiles 0
+.PHONY : all
+
+# The main clean target
+clean:
+	$(MAKE) -f CMakeFiles/Makefile2 clean
+.PHONY : clean
 
-clibrary:
-	@cd $(PWD)/c && make
+# The main clean target
+clean/fast: clean
+.PHONY : clean/fast
+
+# Prepare targets for installation.
+preinstall: all
+	$(MAKE) -f CMakeFiles/Makefile2 preinstall
+.PHONY : preinstall
+
+# Prepare targets for installation.
+preinstall/fast:
+	$(MAKE) -f CMakeFiles/Makefile2 preinstall
+.PHONY : preinstall/fast
+
+# clear depends
+depend:
+	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+.PHONY : depend
+
+#=============================================================================
+# Target rules for targets named bin/feature-based-tracking
+
+# Build rule for target.
+bin/feature-based-tracking: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 bin/feature-based-tracking
+.PHONY : bin/feature-based-tracking
+
+# fast build rule for target.
+bin/feature-based-tracking/fast:
+	$(MAKE) -f CMakeFiles/bin/feature-based-tracking.dir/build.make CMakeFiles/bin/feature-based-tracking.dir/build
+.PHONY : bin/feature-based-tracking/fast
+
+c/feature-based-tracking.o: c/feature-based-tracking.cpp.o
+.PHONY : c/feature-based-tracking.o
+
+# target to build an object file
+c/feature-based-tracking.cpp.o:
+	$(MAKE) -f CMakeFiles/bin/feature-based-tracking.dir/build.make CMakeFiles/bin/feature-based-tracking.dir/c/feature-based-tracking.cpp.o
+.PHONY : c/feature-based-tracking.cpp.o
 
-doc:
-	doxygen
+c/feature-based-tracking.i: c/feature-based-tracking.cpp.i
+.PHONY : c/feature-based-tracking.i
+
+# target to preprocess a source file
+c/feature-based-tracking.cpp.i:
+	$(MAKE) -f CMakeFiles/bin/feature-based-tracking.dir/build.make CMakeFiles/bin/feature-based-tracking.dir/c/feature-based-tracking.cpp.i
+.PHONY : c/feature-based-tracking.cpp.i
+
+c/feature-based-tracking.s: c/feature-based-tracking.cpp.s
+.PHONY : c/feature-based-tracking.s
+
+# target to generate assembly for a file
+c/feature-based-tracking.cpp.s:
+	$(MAKE) -f CMakeFiles/bin/feature-based-tracking.dir/build.make CMakeFiles/bin/feature-based-tracking.dir/c/feature-based-tracking.cpp.s
+.PHONY : c/feature-based-tracking.cpp.s
 
-clean:
-	@cd $(PWD)/c && make clean
\ No newline at end of file
+# Help Target
+help:
+	@echo "The following are some of the valid targets for this Makefile:"
+	@echo "... all (the default if no target is provided)"
+	@echo "... clean"
+	@echo "... depend"
+	@echo "... bin/feature-based-tracking"
+	@echo "... edit_cache"
+	@echo "... rebuild_cache"
+	@echo "... c/feature-based-tracking.o"
+	@echo "... c/feature-based-tracking.i"
+	@echo "... c/feature-based-tracking.s"
+.PHONY : help
+
+
+
+#=============================================================================
+# Special targets to cleanup operation of make.
+
+# Special rule to run CMake to check the build system integrity.
+# No rule that depends on this can have commands that come from listfiles
+# because they might be regenerated.
+cmake_check_build_system:
+	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+.PHONY : cmake_check_build_system
+