File: simpler-thirdparty-build.patch

package info (click to toggle)
geogram 1.9.6-1
  • links: PTS, VCS
  • area: contrib
  • in suites: sid
  • size: 15,436 kB
  • sloc: cpp: 143,890; ansic: 10,098; perl: 1,430; sh: 1,199; yacc: 522; lex: 182; python: 157; javascript: 149; makefile: 17
file content (46 lines) | stat: -rw-r--r-- 1,541 bytes parent folder | download | duplicates (2)
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
Index: geogram/CMakeLists.txt
===================================================================
--- geogram.orig/CMakeLists.txt
+++ geogram/CMakeLists.txt
@@ -129,8 +129,6 @@ if(GEOGRAM_WITH_VORPALINE)
 add_subdirectory(src/lib/vorpalib)
 endif()
 
-add_subdirectory(src/lib/third_party)
-
 if(GEOGRAM_WITH_GRAPHICS)
 add_subdirectory(src/lib/geogram_gfx)
 endif()
Index: geogram/src/lib/geogram/CMakeLists.txt
===================================================================
--- geogram.orig/src/lib/geogram/CMakeLists.txt
+++ geogram/src/lib/geogram/CMakeLists.txt
@@ -13,8 +13,6 @@ ${PROJECT_SOURCE_DIR}/src/lib/geogram/ge
 )
 endif()
 
-add_subdirectory(third_party)
-
 aux_source_directories(SOURCES "Source Files"           .)
 aux_source_directories(SOURCES "Source Files\\basic"    basic)
 aux_source_directories(SOURCES "Source Files\\numerics" numerics)
@@ -45,12 +43,17 @@ set_source_files_properties(version.h PR
 
 include_directories(${PROJECT_BINARY_DIR}/src/lib)
 
-add_library(geogram ${SOURCES} $<TARGET_OBJECTS:geogram_third_party>)
+FILE(GLOB POISSON_RECON_SOURCES third_party/PoissonRecon/*.cpp)
+add_library(geogram
+  ${SOURCES}
+  third_party/xatlas/xatlas.cpp
+  ${POISSON_RECON_SOURCES})
 
 target_compile_features(geogram PUBLIC cxx_std_17)
 
 target_include_directories(geogram PRIVATE
-${PROJECT_SOURCE_DIR}/src/lib/geogram/third_party/amgcl
+    ${PROJECT_SOURCE_DIR}/src/lib/geogram/third_party/xatlas
+    ${PROJECT_SOURCE_DIR}/src/lib/geogram/third_party/PoissonRecon
 )
 
 if(GEOGRAM_WITH_GEOGRAMPLUS)