Merge branch 'devel' of https://github.com/patrikhuber/eos into devel

542a2d2e · Patrik Huber · 4ec5e910 · 297bd39b · 542a2d2e · 542a2d2e
Commit 542a2d2e authored Jan 07, 2017 by Patrik Huber
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

examples/CMakeLists.txt examples/CMakeLists.txt +0 -2

python/CMakeLists.txt python/CMakeLists.txt +0 -2

utils/CMakeLists.txt utils/CMakeLists.txt +0 -2

No files found.
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
-cmake_minimum_required(VERSION 3.1.3)
 # The examples need a few additional dependencies (e.g. boost filesystem and OpenCV highgui):
 #check installed version in order to include the correct OpenCV libraries

--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
-cmake_minimum_required(VERSION 3.1.3)
 # The python bindings may need a few additional dependencies (e.g. boost filesystem and OpenCV), which are
 # included below - at some point it should be checked if they are really needed.

--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
-cmake_minimum_required(VERSION 3.1.3)
 # The utils need a few additional dependencies (e.g. boost filesystem and OpenCV highgui):
 #check installed version in order to include the correct OpenCV libraries