-
Notifications
You must be signed in to change notification settings - Fork 1.9k
/
Copy path0001-conan-4.0.2.patch
132 lines (124 loc) · 6.05 KB
/
0001-conan-4.0.2.patch
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
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
diff --color -ruN cmake/GtsamPythonWrap.cmake cmake/GtsamPythonWrap.cmake
--- cmake/GtsamPythonWrap.cmake 2019-10-08 00:05:09.000000000 -0300
+++ cmake/GtsamPythonWrap.cmake 2020-12-01 16:12:54.459435000 -0300
@@ -69,7 +69,7 @@
ENDIF(MSVC)
# Installs the library in the gtsam folder, which is used by setup.py to create the gtsam package
- set(PYTHON_MODULE_DIRECTORY ${CMAKE_SOURCE_DIR}/python/gtsam)
+ set(PYTHON_MODULE_DIRECTORY ${GTSAM_SOURCE_DIR}/python/gtsam)
# Cause the library to be output in the correct directory.
add_custom_command(TARGET ${moduleName}_python
POST_BUILD
diff --color -ruN CMakeLists.txt CMakeLists.txt
--- CMakeLists.txt 2019-10-08 00:05:09.000000000 -0300
+++ CMakeLists.txt 2020-12-01 16:12:54.459435000 -0300
@@ -35,7 +35,7 @@
include(GtsamPrinting)
# guard against in-source builds
-if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+if(${GTSAM_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
message(FATAL_ERROR "In-source builds not allowed. Please make a new directory (called a build directory) and run CMake from there. You may need to remove CMakeCache.txt. ")
endif()
@@ -163,13 +163,13 @@
set(BOOST_FIND_MINIMUM_VERSION 1.43)
set(BOOST_FIND_MINIMUM_COMPONENTS serialization system filesystem thread program_options date_time timer chrono regex)
-find_package(Boost ${BOOST_FIND_MINIMUM_VERSION} COMPONENTS ${BOOST_FIND_MINIMUM_COMPONENTS})
+find_package(Boost ${BOOST_FIND_MINIMUM_VERSION} COMPONENTS ${BOOST_FIND_MINIMUM_COMPONENTS} REQUIRED)
# Required components
-if(NOT Boost_SERIALIZATION_LIBRARY OR NOT Boost_SYSTEM_LIBRARY OR NOT Boost_FILESYSTEM_LIBRARY OR
- NOT Boost_THREAD_LIBRARY OR NOT Boost_DATE_TIME_LIBRARY)
- message(FATAL_ERROR "Missing required Boost components >= v1.43, please install/upgrade Boost or configure your search paths.")
-endif()
+#if(NOT Boost_SERIALIZATION_LIBRARY OR NOT Boost_SYSTEM_LIBRARY OR NOT Boost_FILESYSTEM_LIBRARY OR
+# NOT Boost_THREAD_LIBRARY OR NOT Boost_DATE_TIME_LIBRARY)
+# message(FATAL_ERROR "Missing required Boost components >= v1.43, please install/upgrade Boost or configure your search paths.")
+#endif()
# Allow for not using the timer libraries on boost < 1.48 (GTSAM timing code falls back to old timer library)
option(GTSAM_DISABLE_NEW_TIMERS "Disables using Boost.chrono for timing" OFF)
@@ -179,30 +179,22 @@
# so we downgraded this to classic filenames-based variables, and manually adding
# the target_include_directories(xxx ${Boost_INCLUDE_DIR})
set(GTSAM_BOOST_LIBRARIES
- optimized ${Boost_SERIALIZATION_LIBRARY_RELEASE}
- optimized ${Boost_SYSTEM_LIBRARY_RELEASE}
- optimized ${Boost_FILESYSTEM_LIBRARY_RELEASE}
- optimized ${Boost_THREAD_LIBRARY_RELEASE}
- optimized ${Boost_DATE_TIME_LIBRARY_RELEASE}
- optimized ${Boost_REGEX_LIBRARY_RELEASE}
- debug ${Boost_SERIALIZATION_LIBRARY_DEBUG}
- debug ${Boost_SYSTEM_LIBRARY_DEBUG}
- debug ${Boost_FILESYSTEM_LIBRARY_DEBUG}
- debug ${Boost_THREAD_LIBRARY_DEBUG}
- debug ${Boost_DATE_TIME_LIBRARY_DEBUG}
- debug ${Boost_REGEX_LIBRARY_DEBUG}
+ Boost::serialization
+ Boost::system
+ Boost::filesystem
+ Boost::thread
+ Boost::date_time
+ Boost::regex
)
message(STATUS "GTSAM_BOOST_LIBRARIES: ${GTSAM_BOOST_LIBRARIES}")
if (GTSAM_DISABLE_NEW_TIMERS)
message("WARNING: GTSAM timing instrumentation manually disabled")
list_append_cache(GTSAM_COMPILE_DEFINITIONS_PUBLIC DGTSAM_DISABLE_NEW_TIMERS)
else()
- if(Boost_TIMER_LIBRARY)
+ if(TARGET Boost::timer)
list(APPEND GTSAM_BOOST_LIBRARIES
- optimized ${Boost_TIMER_LIBRARY_RELEASE}
- optimized ${Boost_CHRONO_LIBRARY_RELEASE}
- debug ${Boost_TIMER_LIBRARY_DEBUG}
- debug ${Boost_CHRONO_LIBRARY_DEBUG}
+ Boost::timer
+ Boost::chrono
)
else()
list(APPEND GTSAM_BOOST_LIBRARIES rt) # When using the header-only boost timer library, need -lrt
@@ -328,7 +320,7 @@
set(GTSAM_EIGEN_INCLUDE_FOR_INSTALL "include/gtsam/3rdparty/Eigen/")
# The actual include directory (for BUILD cmake target interface):
- set(GTSAM_EIGEN_INCLUDE_FOR_BUILD "${CMAKE_SOURCE_DIR}/gtsam/3rdparty/Eigen/")
+ set(GTSAM_EIGEN_INCLUDE_FOR_BUILD "${GTSAM_SOURCE_DIR}/gtsam/3rdparty/Eigen/")
endif()
# Detect Eigen version:
diff --color -ruN gtsam/CMakeLists.txt gtsam/CMakeLists.txt
--- gtsam/CMakeLists.txt 2019-10-08 00:05:09.000000000 -0300
+++ gtsam/CMakeLists.txt 2020-12-01 16:12:54.459435000 -0300
@@ -145,18 +145,18 @@
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/CCOLAMD/Include>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include/gtsam/3rdparty/CCOLAMD>
# main gtsam includes:
- $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}>
+ $<BUILD_INTERFACE:${GTSAM_SOURCE_DIR}>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include/>
# config.h
- $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
+ $<BUILD_INTERFACE:${GTSAM_BINARY_DIR}>
# unit tests:
- $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/CppUnitLite>
+ $<BUILD_INTERFACE:${GTSAM_SOURCE_DIR}/CppUnitLite>
)
if(GTSAM_SUPPORT_NESTED_DISSECTION)
target_include_directories(gtsam BEFORE PUBLIC
- $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/gtsam/3rdparty/metis/include>
- $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/gtsam/3rdparty/metis/libmetis>
- $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/gtsam/3rdparty/metis/GKlib>
+ $<BUILD_INTERFACE:${GTSAM_SOURCE_DIR}/gtsam/3rdparty/metis/include>
+ $<BUILD_INTERFACE:${GTSAM_SOURCE_DIR}/gtsam/3rdparty/metis/libmetis>
+ $<BUILD_INTERFACE:${GTSAM_SOURCE_DIR}/gtsam/3rdparty/metis/GKlib>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include/gtsam/3rdparty/metis/>
)
endif()
diff --color -ruN wrap/CMakeLists.txt wrap/CMakeLists.txt
--- wrap/CMakeLists.txt 2019-10-08 00:05:09.000000000 -0300
+++ wrap/CMakeLists.txt 2020-12-01 16:12:54.459435000 -0300
@@ -20,7 +20,7 @@
list(REMOVE_ITEM wrap_srcs ${CMAKE_CURRENT_SOURCE_DIR}/wrap.cpp)
add_library(wrap_lib STATIC ${wrap_srcs} ${wrap_headers})
target_include_directories(wrap_lib PUBLIC
- $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}>
+ $<BUILD_INTERFACE:${GTSAM_SOURCE_DIR}>
)
if (NOT GTSAM_WRAP_SERIALIZATION)
target_compile_definitions(wrap_lib PUBLIC -DWRAP_DISABLE_SERIALIZE)