Merge branch 'develop'

CMakeLists.txt

@@ -10,6 +10,7 @@ add_subdirectory(src)
 # Test folder
 option(BUILD_TESTS "Build Tests" ON)
 if(BUILD_TESTS)
+  enable_testing()
   add_subdirectory(tests)
 endif(BUILD_TESTS)
 

tests/CMakeLists.txt

@@ -14,5 +14,4 @@ add_executable(unit_tests tree_node.cpp main.cpp)
 target_link_libraries(unit_tests catch adt_libs)
 
 # Enable Unit testing
-enable_testing()
 add_test(NAME UnitTests COMMAND unit_tests)