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
|
--- CMakeLists.txt.orig 2021-09-29 21:29:01 UTC
+++ CMakeLists.txt
@@ -10,23 +10,23 @@ execute_process(COMMAND sh -c "${CMAKE_SOURCE_DIR}/cma
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
# Configure global include directories, visible in subdirectories.
include_directories(.
- extern/double-conversion
+ #extern/double-conversion
extern/ordered-map/include
extern/blosc
extern/stb
- extern/glfw/include
- extern/glm
+ #extern/glfw/include
+ #extern/glm
extern/glad)
if (MSYS)
# On MSYS we use MinGW packages for OpenVDB and GoogleTest
else ()
include_directories(
extern/googletest/googletest/include
- extern/openvdb/openvdb)
+ )
endif ()
if (APPLE)
@@ -45,6 +45,7 @@ endif (APPLE)
# Libraries
# ===============================================
+# REPLxx used to be unbundled, but due to the incompatibilities (see Bug#241205) it was bundled again
# REPLxx library
file(GLOB ReplxxSrc "extern/replxx/src/*.cxx" "extern/replxx/src/*.cpp")
add_library(replxx ${ReplxxSrc})
@@ -55,9 +56,9 @@ set_property(TARGET replxx PROPERTY CXX_STANDARD 17)
target_compile_definitions(replxx PRIVATE REPLXX_STATIC=1)
# double-conversion library
-file(GLOB DoubleConversionSrc "extern/double-conversion/double-conversion/*.cc")
-add_library(double-conversion ${DoubleConversionSrc})
-set_property(TARGET double-conversion PROPERTY CXX_STANDARD 17)
+#file(GLOB DoubleConversionSrc "extern/double-conversion/double-conversion/*.cc")
+#add_library(double-conversion ${DoubleConversionSrc})
+#set_property(TARGET double-conversion PROPERTY CXX_STANDARD 17)
# glad library, an OpenGL loader
add_library(glad
@@ -100,7 +101,7 @@ if (MSYS)
set( LibOpenVDB "openvdb" )
set( LibHalf "Half" )
else ()
- set( LibOpenVDB "openvdb_static" )
+ #set( LibOpenVDB "openvdb_static" )
set( LibHalf "" )
endif ()
@@ -194,9 +195,9 @@ if (NOT DEFINED MSYS)
add_library(dummy cmake/dummy.cc)
add_library(Blosc::blosc ALIAS dummy)
add_library(TBB::tbb ALIAS dummy)
- add_subdirectory(extern/openvdb/openvdb/openvdb EXCLUDE_FROM_ALL)
- set_property(TARGET openvdb_static PROPERTY CXX_STANDARD 14)
- add_subdirectory(extern/googletest/googletest EXCLUDE_FROM_ALL)
+ #add_subdirectory(extern/openvdb/openvdb/openvdb EXCLUDE_FROM_ALL)
+ #set_property(TARGET openvdb_static PROPERTY CXX_STANDARD 14)
+ #add_subdirectory(extern/googletest/googletest EXCLUDE_FROM_ALL)
endif ()
-add_subdirectory(extern/glfw EXCLUDE_FROM_ALL)
+#add_subdirectory(extern/glfw EXCLUDE_FROM_ALL)
|
