diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12f3591e..79ccb017 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,6 +39,19 @@ include_directories(${PROJECT_SOURCE_DIR}/src/app)
 include_directories(${PROJECT_SOURCE_DIR}/src/app/gui)
 include_directories(${PROJECT_SOURCE_DIR}/src/app/plugins)
 include_directories(${PROJECT_SOURCE_DIR}/src/app/stacks)
+
+find_package( OpenCV 2 QUIET )
+if(OpenCV_FOUND)
+  include_directories(${OpenCV_INCLUDE_DIRS})
+  add_definitions(-D OPENCV)
+  set (OPTIONAL_SRCS ${OPTIONAL_SRCS} src/app/gui/neurowidget.cpp src/app/plugins/plugin_neuralcolorcalib.cpp)
+  set (OPTIONAL_HEADERS ${OPTIONAL_HEADERS} src/app/gui/neurowidget.h)
+  set (OPTIONAL_UI_SRCS ${OPTIONAL_UI_SRCS} src/app/gui/neurowidget.ui)
+  message(STATUS "OpenCV found")
+else()
+  message(WARNING "OpenCV NOT found => Neural Calibration not available")
+endif()
+
 message("My Msg+++++++++++++++++++++++++++++++++++++++++++++++++ ${eigen3_INCLUDE_DIRS}")
 include_directories(include ${catkin_INCLUDE_DIRS} ${eigen3_INCLUDE_DIRS})
 set (SRCS
@@ -76,6 +89,8 @@ set (SRCS
 	src/app/stacks/multivisionstack.cpp
 	src/app/stacks/stack_robocup_ssl.cpp
 	src/app/stacks/visionstack.cpp
+
+	${OPTIONAL_SRCS}
 )
 
 qt4_wrap_cpp (MOC_SRCS
@@ -96,11 +111,14 @@ qt4_wrap_cpp (MOC_SRCS
 	src/app/plugins/visionplugin.h
 	
 	src/app/stacks/multistack_robocup_ssl.h
+
+	${OPTIONAL_HEADERS}
 )
 
 qt4_wrap_ui (UI_SRCS
 	src/app/gui/mainwindow.ui
 	src/app/gui/videowidget.ui
+	${OPTIONAL_UI_SRCS}
 )
 
 qt4_add_resources(RC_SRCS