--- a/CMakeLists.txt	Thu Apr 18 15:29:33 2013 -0400
+++ b/CMakeLists.txt	Fri Dec 05 12:13:53 2014 -0500
@@ -14,19 +14,36 @@
 	CMAKE_CXX_FLAGS "-g -Wall"
 )
 
-ADD_EXECUTABLE(
-  bin/feature-based-tracking
-  c/feature-based-tracking.cpp
-  )
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY bin)
+
+add_executable(feature-based-tracking
+	c/cvutils.cpp
+	c/feature-based-tracking.cpp
+	c/Motion.cpp
+	c/Parameters.cpp
+	c/utils.cpp
+	c/InputFrameListModule.cpp
+	c/InputVideoFileModule.cpp
+	)
+
+find_package(Boost REQUIRED program_options filesystem system)
+find_library(TrajectoryManagement_LIBRARY TrajectoryManagementAndAnalysis)
+find_path(TrajectoryManagement_INCLUDE_DIR src/Trajectory.h)
 
-INCLUDE_DIRECTORIES(
-#  bin/feature-based-tracking
-/home/nicolas/Research/Code/trajectorymanagementandanalysis/trunk/src/TrajectoryManagementAndAnalysis
-)
+add_definitions(
+	-DUSE_OPENCV
+	)
+
+include_directories(
+	${PROJECT_SOURCE_DIR}/include
+	${TrajectoryManagement_INCLUDE_DIR}
+	)
 
-#TARGET_LINK_LIBRARIES(
-#  bin/feature-based-tracking
-#  ${OpenCV_LIBS}
-#  $(TrajectoryManagement_DIR)
-  #	${SQLite3_LIBS}
-#  )
+target_link_libraries(feature-based-tracking
+	${TrajectoryManagement_LIBRARY}
+	${SQLite3_LIBS}
+	${OpenCV_LIBS}
+	${Boost_LIBRARIES}
+	)
+
+install(TARGETS feature-based-tracking DESTINATION bin)