Skip to content

Commit e644437

Browse files
committed
[cmake] removed unnecessary dependency boost atomic
1 parent f17a1f5 commit e644437

File tree

3 files changed

+21
-5
lines changed

3 files changed

+21
-5
lines changed

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ if(APPLE)
111111
endif(APPLE)
112112

113113
# FIND BOOST
114-
set(BOOST_REQUIRED_COMPONENTS "atomic;chrono;date_time;filesystem;program_options;serialization;system;thread;timer;math_c99")
114+
#set(BOOST_REQUIRED_COMPONENTS "chrono;date_time;filesystem;program_options;serialization;system;thread;timer;math_c99")
115+
set(BOOST_REQUIRED_COMPONENTS "chrono;date_time;filesystem;program_options;serialization;thread;timer")
115116
if(WIN32)
116117
set(BOOST_REQUIRED_COMPONENTS "${BOOST_REQUIRED_COMPONENTS};stacktrace_windbg")
117118
else()

INSTALL.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Note: On Windows, there are compatibility issues to build the GPU part due to co
2020
Most of the dependencies can be installed from the common repositories (apt, yum etc):
2121

2222
- Eigen3 (libeigen3-dev) >= 3.3.4 (NOTE: in order to have Cuda support on Windows, at least version 3.3.9 is required)
23-
- Boost >= 1.66 ([accumulators, atomic, chrono, core, date-time, exception, filesystem, math, program-options, ptr-container, system, serialization, stacktrace, timer, thread]-dev)
23+
- Boost >= 1.66 ([accumulators, chrono, core, date-time, exception, filesystem, math, program-options, ptr-container, system, serialization, stacktrace, timer, thread]-dev)
2424
- OpenCV >= 3.1
2525
- TBB >= 2021.5.0
2626

src/CMakeLists.txt

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,15 @@ if(CCTAG_WITH_CUDA)
174174
# since we used CUDA_ADD_LIBRARY we cannot use PUBLIC or PRIVATE here
175175
target_link_libraries(CCTag
176176
${OpenCV_LIBS}
177-
Boost::date_time Boost::chrono Boost::thread Boost::serialization Boost::system Boost::filesystem Boost::atomic Boost::program_options Boost::timer Boost::math_c99
177+
Boost::date_time
178+
Boost::chrono
179+
Boost::thread
180+
Boost::serialization
181+
Boost::system
182+
Boost::filesystem
183+
Boost::program_options
184+
Boost::timer
185+
# Boost::math_c99
178186
Eigen3::Eigen
179187
TBB::tbb
180188
${CUDA_CUDADEVRT_LIBRARY})
@@ -220,7 +228,14 @@ else() # without CUDA
220228
PUBLIC
221229
${OpenCV_LIBS}
222230
Eigen3::Eigen
223-
Boost::atomic Boost::chrono Boost::date_time Boost::filesystem Boost::serialization Boost::system Boost::thread Boost::timer Boost::math_c99
231+
Boost::chrono
232+
Boost::date_time
233+
Boost::filesystem
234+
Boost::serialization
235+
# Boost::system
236+
Boost::thread
237+
Boost::timer
238+
# Boost::math_c99
224239
PRIVATE
225240
TBB::tbb)
226241

@@ -233,7 +248,7 @@ endif()
233248
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
234249
target_compile_definitions(CCTag PUBLIC "-DNOMINMAX")
235250
endif()
236-
251+
target_compile_options(CCTag PUBLIC -Wno-enum-constexpr-conversion)
237252
# enable serialization
238253
if(CCTAG_SERIALIZE)
239254
target_compile_definitions(CCTag PUBLIC "-DCCTAG_SERIALIZE")

0 commit comments

Comments
 (0)