diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 47357c69..46ad126b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -516,6 +516,10 @@ if(CUTTER_ENABLE_PYTHON)
             endif()
         endforeach()
 
+<<<<<<< HEAD
+=======
+        get_target_property(BINDINGS_INCLUDE_DIRS CutterLib INCLUDE_DIRECTORIES)
+>>>>>>> Fix travis
         if(APPLE AND _qt5Core_install_prefix)
             list(APPEND BINDINGS_INCLUDE_DIRS "${_qt5Core_install_prefix}/include")
             list(APPEND BINDINGS_INCLUDE_DIRS "${_qt5Core_install_prefix}/include/QtCore")
@@ -595,3 +599,7 @@ if(UNIX AND NOT APPLE)
         DESTINATION "share/applications"
         COMPONENT Devel)
 endif()
+
+if(CUTTER_ENABLE_TESTS)
+    add_subdirectory(test)
+endif()