Skip to content

Commit bc69e03

Browse files
committed
static dbow g2o
1 parent 022bd84 commit bc69e03

3 files changed

Lines changed: 45 additions & 45 deletions

File tree

CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ find_package(Pangolin REQUIRED)
5454
find_package( MATLAB REQUIRED )
5555

5656
# DBoW2 target
57-
add_subdirectory(${PROJECT_SOURCE_DIR}/Thirdparty/DBoW2/)
57+
# add_subdirectory(${PROJECT_SOURCE_DIR}/Thirdparty/DBoW2/)
5858
# g2o target
59-
add_subdirectory(${PROJECT_SOURCE_DIR}/Thirdparty/g2o/)
59+
# add_subdirectory(${PROJECT_SOURCE_DIR}/Thirdparty/g2o/)
6060

6161
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/lib)
6262

63-
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
63+
# set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
6464

6565
add_library(${PROJECT_NAME} SHARED
6666
src/System.cc
@@ -95,8 +95,8 @@ ${OpenCV_LIBS}
9595
${EIGEN3_LIBS}
9696
${Pangolin_LIBRARIES}
9797
${MATLAB_LIBRARIES}
98-
DBoW2
99-
g2o
98+
${PROJECT_SOURCE_DIR}/Thirdparty/DBoW2/lib/libDBoW2.a
99+
${PROJECT_SOURCE_DIR}/Thirdparty/g2o/lib/libg2o.a
100100
)
101101

102102
target_include_directories(${PROJECT_NAME} PUBLIC

Thirdparty/DBoW2/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 2.8)
22
project(DBoW2)
33

4-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -O3 -march=native ")
4+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -O3 -march=native")
55
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O3 -march=native -fPIC")
66
if(UNIX)
77
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
@@ -38,7 +38,7 @@ find_package(OpenCV REQUIRED)
3838
set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
3939

4040
# include_directories(${OpenCV_INCLUDE_DIRS})
41-
add_library(DBoW2 SHARED ${SRCS_DBOW2} ${SRCS_DUTILS})
41+
add_library(DBoW2 STATIC ${SRCS_DBOW2} ${SRCS_DUTILS})
4242
target_link_libraries(DBoW2 ${OpenCV_LIBS})
4343
target_include_directories(DBoW2 PUBLIC
4444
${PROJECT_BINARY_DIR}

Thirdparty/g2o/CMakeLists.txt

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ MESSAGE(STATUS "BUILD TYPE:" ${CMAKE_BUILD_TYPE})
1616
IF(WIN32)
1717
SET(G2O_LIB_TYPE STATIC)
1818
ELSE()
19-
SET(G2O_LIB_TYPE SHARED)
19+
SET(G2O_LIB_TYPE STATIC)
2020
ENDIF()
2121

2222
# There seems to be an issue with MSVC8
@@ -58,8 +58,8 @@ IF(OPENMP_FOUND AND G2O_USE_OPENMP)
5858
ENDIF(OPENMP_FOUND AND G2O_USE_OPENMP)
5959

6060
# Compiler specific options for gcc
61-
SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 ")
62-
SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3")
61+
SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -fPIC")
62+
SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -fPIC")
6363

6464
# activate warnings !!!
6565
SET(g2o_C_FLAGS "${g2o_C_FLAGS} -Wall")
@@ -86,7 +86,7 @@ configure_file(config.h.in ${g2o_SOURCE_DIR}/config.h)
8686
INCLUDE_DIRECTORIES(
8787
${g2o_SOURCE_DIR}/core
8888
${g2o_SOURCE_DIR}/types
89-
${g2o_SOURCE_DIR}/stuff
89+
${g2o_SOURCE_DIR}/stuff
9090
${G2O_EIGEN3_INCLUDE})
9191

9292
# Include the subdirectories
@@ -107,72 +107,72 @@ g2o/core/base_binary_edge.h
107107
g2o/core/hyper_graph_action.cpp
108108
g2o/core/base_binary_edge.hpp
109109
g2o/core/hyper_graph_action.h
110-
g2o/core/base_multi_edge.h
110+
g2o/core/base_multi_edge.h
111111
g2o/core/hyper_graph.cpp
112-
g2o/core/base_multi_edge.hpp
112+
g2o/core/base_multi_edge.hpp
113113
g2o/core/hyper_graph.h
114-
g2o/core/base_unary_edge.h
114+
g2o/core/base_unary_edge.h
115115
g2o/core/linear_solver.h
116-
g2o/core/base_unary_edge.hpp
116+
g2o/core/base_unary_edge.hpp
117117
g2o/core/marginal_covariance_cholesky.cpp
118-
g2o/core/base_vertex.h
118+
g2o/core/base_vertex.h
119119
g2o/core/marginal_covariance_cholesky.h
120-
g2o/core/base_vertex.hpp
120+
g2o/core/base_vertex.hpp
121121
g2o/core/matrix_structure.cpp
122-
g2o/core/batch_stats.cpp
122+
g2o/core/batch_stats.cpp
123123
g2o/core/matrix_structure.h
124-
g2o/core/batch_stats.h
124+
g2o/core/batch_stats.h
125125
g2o/core/openmp_mutex.h
126-
g2o/core/block_solver.h
127-
g2o/core/block_solver.hpp
128-
g2o/core/parameter.cpp
129-
g2o/core/parameter.h
130-
g2o/core/cache.cpp
126+
g2o/core/block_solver.h
127+
g2o/core/block_solver.hpp
128+
g2o/core/parameter.cpp
129+
g2o/core/parameter.h
130+
g2o/core/cache.cpp
131131
g2o/core/cache.h
132-
g2o/core/optimizable_graph.cpp
133-
g2o/core/optimizable_graph.h
134-
g2o/core/solver.cpp
132+
g2o/core/optimizable_graph.cpp
133+
g2o/core/optimizable_graph.h
134+
g2o/core/solver.cpp
135135
g2o/core/solver.h
136-
g2o/core/creators.h
136+
g2o/core/creators.h
137137
g2o/core/optimization_algorithm_factory.cpp
138-
g2o/core/estimate_propagator.cpp
138+
g2o/core/estimate_propagator.cpp
139139
g2o/core/optimization_algorithm_factory.h
140-
g2o/core/estimate_propagator.h
141-
g2o/core/factory.cpp
140+
g2o/core/estimate_propagator.h
141+
g2o/core/factory.cpp
142142
g2o/core/optimization_algorithm_property.h
143-
g2o/core/factory.h
143+
g2o/core/factory.h
144144
g2o/core/sparse_block_matrix.h
145-
g2o/core/sparse_optimizer.cpp
145+
g2o/core/sparse_optimizer.cpp
146146
g2o/core/sparse_block_matrix.hpp
147147
g2o/core/sparse_optimizer.h
148-
g2o/core/hyper_dijkstra.cpp
148+
g2o/core/hyper_dijkstra.cpp
149149
g2o/core/hyper_dijkstra.h
150-
g2o/core/parameter_container.cpp
150+
g2o/core/parameter_container.cpp
151151
g2o/core/parameter_container.h
152-
g2o/core/optimization_algorithm.cpp
152+
g2o/core/optimization_algorithm.cpp
153153
g2o/core/optimization_algorithm.h
154-
g2o/core/optimization_algorithm_with_hessian.cpp
154+
g2o/core/optimization_algorithm_with_hessian.cpp
155155
g2o/core/optimization_algorithm_with_hessian.h
156-
g2o/core/optimization_algorithm_levenberg.cpp
156+
g2o/core/optimization_algorithm_levenberg.cpp
157157
g2o/core/optimization_algorithm_levenberg.h
158-
g2o/core/jacobian_workspace.cpp
158+
g2o/core/jacobian_workspace.cpp
159159
g2o/core/jacobian_workspace.h
160-
g2o/core/robust_kernel.cpp
160+
g2o/core/robust_kernel.cpp
161161
g2o/core/robust_kernel.h
162162
g2o/core/robust_kernel_factory.cpp
163163
g2o/core/robust_kernel_factory.h
164-
g2o/core/robust_kernel_impl.cpp
164+
g2o/core/robust_kernel_impl.cpp
165165
g2o/core/robust_kernel_impl.h
166166
#stuff
167167
g2o/stuff/string_tools.h
168-
g2o/stuff/color_macros.h
168+
g2o/stuff/color_macros.h
169169
g2o/stuff/macros.h
170170
g2o/stuff/timeutil.cpp
171171
g2o/stuff/misc.h
172172
g2o/stuff/timeutil.h
173-
g2o/stuff/os_specific.c
173+
g2o/stuff/os_specific.c
174174
g2o/stuff/os_specific.h
175175
g2o/stuff/string_tools.cpp
176-
g2o/stuff/property.cpp
177-
g2o/stuff/property.h
176+
g2o/stuff/property.cpp
177+
g2o/stuff/property.h
178178
)

0 commit comments

Comments
 (0)