1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e658ef8..5c68ef2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
#---------------------------------------------------------------
# Load macros and functions for Elements-based projects
diff --git a/SEBenchmarks/CMakeLists.txt b/SEBenchmarks/CMakeLists.txt
index 8c45f20..bc10377 100644
--- a/SEBenchmarks/CMakeLists.txt
+++ b/SEBenchmarks/CMakeLists.txt
@@ -1,5 +1,3 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5)
-
#===============================================================================
# Load elements_subdir macro here
# Examples:
diff --git a/SEFramework/CMakeLists.txt b/SEFramework/CMakeLists.txt
index 7755525..fcf4a32 100644
--- a/SEFramework/CMakeLists.txt
+++ b/SEFramework/CMakeLists.txt
@@ -1,5 +1,3 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5)
-
#===============================================================================
# Load elements_subdir macro here
# Examples:
diff --git a/SEImplementation/CMakeLists.txt b/SEImplementation/CMakeLists.txt
index 1b52a93..75b0df5 100644
--- a/SEImplementation/CMakeLists.txt
+++ b/SEImplementation/CMakeLists.txt
@@ -1,5 +1,3 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5)
-
#===============================================================================
# Load elements_subdir macro here
# Examples:
diff --git a/SEMain/CMakeLists.txt b/SEMain/CMakeLists.txt
index 8fdb92a..b904bc4 100644
--- a/SEMain/CMakeLists.txt
+++ b/SEMain/CMakeLists.txt
@@ -1,5 +1,3 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5)
-
#===============================================================================
# Load elements_subdir macro here
# Examples:
diff --git a/SEMain/src/lib/ProgressNCurses.cpp b/SEMain/src/lib/ProgressNCurses.cpp
index 63492e8..f59fe77 100644
--- a/SEMain/src/lib/ProgressNCurses.cpp
+++ b/SEMain/src/lib/ProgressNCurses.cpp
@@ -27,6 +27,9 @@
#include <iostream>
#include <iomanip>
#include <mutex>
+#ifdef timeout
+#undef timeout
+#endif
#include <boost/algorithm/string/trim.hpp>
#include <boost/thread.hpp>
diff --git a/SEUtils/CMakeLists.txt b/SEUtils/CMakeLists.txt
index 9f3c453..42bc5ce 100644
--- a/SEUtils/CMakeLists.txt
+++ b/SEUtils/CMakeLists.txt
@@ -1,5 +1,3 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5)
-
#===============================================================================
# Load elements_subdir macro here
# Examples:
diff --git a/cmake/modules/FindLevmar.cmake b/cmake/modules/FindLevmar.cmake
index a247883..7c9f4bb 100644
--- a/cmake/modules/FindLevmar.cmake
+++ b/cmake/modules/FindLevmar.cmake
@@ -12,7 +12,7 @@ if(NOT Levmar_FOUND)
find_path(LEVMAR_INCLUDE_DIR levmar.h
HINTS ENV LEVMAR_ROOT_DIR LEVMAR_INSTALL_DIR
- PATH_SUFFIXES include)
+ PATH_SUFFIXES include include/levmar)
find_library(LEVMAR_LIBRARY levmar
HINTS ENV LEVMAR_ROOT_DIR LEVMAR_INSTALL_DIR
|