blob: d674ccd69ae781f14b710ace0fc0f940defd4587 (
plain)
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
|
--- db/nist/CMakeLists.txt
+++ db/nist/CMakeLists.txt
@@ -10,7 +10,8 @@ set(NIST_SAMPLE_MODELS
)
foreach(im ${NIST_SAMPLE_MODELS})
- ADD_G_TARGET(${im} "BRL-CAD Geometry Models/Sample")
+# disabled because this often segfaults
+# ADD_G_TARGET(${im} "BRL-CAD Geometry Models/Sample")
endforeach(im ${NIST_SAMPLE_MODELS})
CMAKEFILES(
--- regress/coverage/covgcheck.cpp
+++ regress/coverage/covgcheck.cpp
@@ -43,6 +43,7 @@
#include <cctype>
#include <cstdio>
+#include <cstring>
#include <algorithm>
#include <locale>
#include <fstream>
--- regress/repository/repocheck.cpp
+++ regress/repository/repocheck.cpp
@@ -43,6 +43,7 @@
#include <cctype>
#include <cstdio>
+#include <cstring>
#include <algorithm>
#include <locale>
#include <fstream>
--- src/other/ext/assetimport.cmake
+++ src/other/ext/assetimport.cmake
@@ -68,6 +68,7 @@ if (BRLCAD_ASSETIMPORT_BUILD)
-DASSIMP_BUILD_MINIZIP=ON
-DASSIMP_INJECT_DEBUG_POSTFIX=OFF
-DASSIMP_INSTALL_PDB=OFF
+ -DASSIMP_WARNINGS_AS_ERRORS=OFF
DEPENDS ${ASSETIMPORT_DEPS}
LOG_CONFIGURE ${EXT_BUILD_QUIET}
LOG_BUILD ${EXT_BUILD_QUIET}
|