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
88
89
90
91
92
93
94
95
96
97
|
Fix standalone installation, headers and private predicate symbols.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,10 +37,12 @@
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+include(GNUInstallDirs)
+
list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
set(MCUT_MAJOR 1)
-set(MCUT_MINOR 2)
+set(MCUT_MINOR 3)
set(MCUT_PATCH 0)
set( MCUT_VERSION "${MCUT_MAJOR}.${MCUT_MINOR}.${MCUT_PATCH}" )
@@ -260,18 +262,18 @@
# dynamic libs
#
- install(TARGETS ${mpn_shared_lib_name}
+ install(TARGETS ${target_name}
LIBRARY
- DESTINATION lib/shared
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
COMPONENT dynamic_libraries)
else()
#
# static libs
#
- install(TARGETS ${mpn_static_lib_name}
+ install(TARGETS ${target_name}
ARCHIVE
- DESTINATION lib/static
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
COMPONENT static_libraries)
endif()
@@ -279,14 +281,9 @@
# headers
#
install(FILES ${MCUT_INCLUDE_DIR}/mcut/mcut.h ${MCUT_INCLUDE_DIR}/mcut/platform.h
- DESTINATION include/mcut
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mcut
COMPONENT headers)
-install(FILES
- ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt
- ${CMAKE_CURRENT_SOURCE_DIR}/README.md
- DESTINATION ./
- COMPONENT text_files)
#
# notify CPack of the names of all of the components in the project
--- a/include/mcut/internal/frontend.h
+++ b/include/mcut/internal/frontend.h
@@ -51,6 +51,7 @@
#include "mcut/mcut.h"
+#include <chrono>
#include <future>
#include <map>
#include <memory>
--- a/source/math.cpp
+++ b/source/math.cpp
@@ -35,6 +35,7 @@
#include "mcut/internal/math.h"
#include <algorithm> // std::sort
+#include <cstdint>
#include <cstdlib>
#include <tuple> // std::make_tuple std::get<>
--- a/source/shewchuk.c
+++ b/source/shewchuk.c
@@ -1420,7 +1420,7 @@
/* */
/*****************************************************************************/
-int compress(elen, e, h) /* e and h may be the same. */
+static int compress(elen, e, h) /* e and h may be the same. */
int elen;
REAL *e;
REAL *h;
@@ -5686,7 +5686,7 @@
/* */
/*****************************************************************************/
-int compress(elen, e, h) /* e and h may be the same. */
+static int compress(elen, e, h) /* e and h may be the same. */
int elen;
REAL* e;
REAL* h;
|
