Skip to content

Commit 65f0b55

Browse files
authored
Disable link to libodbc by default (#397)
In machine 85 we install libodbc for other tests. But it make binary theflash link to libodbc.so and libltdl.so by default, which we don't actually need. In this PR I disable link to libodbc by default.
1 parent 28f0dff commit 65f0b55

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

Diff for: CMakeLists.txt

+11-7
Original file line numberDiff line numberDiff line change
@@ -253,13 +253,17 @@ include (cmake/find_boost.cmake)
253253
# openssl, zlib before poco
254254
include (cmake/find_zlib.cmake)
255255
include (cmake/find_zstd.cmake)
256-
include (cmake/find_ltdl.cmake) # for odbc
257-
if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/poco/cmake/FindODBC.cmake)
258-
include (${CMAKE_CURRENT_SOURCE_DIR}/contrib/poco/cmake/FindODBC.cmake) # for poco
259-
else ()
260-
include (cmake/find_odbc.cmake)
261-
endif ()
262-
message (STATUS "Using odbc: ${ODBC_INCLUDE_DIRECTORIES} : ${ODBC_LIBRARIES}")
256+
option (ENABLE_ODBC "Set to ON to link odbc libraries if exists" OFF)
257+
message(STATUS "enalbe odbc: ${ENABLE_ODBC}")
258+
if (ENABLE_ODBC)
259+
include (cmake/find_ltdl.cmake) # for odbc
260+
if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/poco/cmake/FindODBC.cmake)
261+
include (${CMAKE_CURRENT_SOURCE_DIR}/contrib/poco/cmake/FindODBC.cmake) # for poco
262+
else ()
263+
include (cmake/find_odbc.cmake)
264+
endif ()
265+
message (STATUS "Using odbc: ${ODBC_INCLUDE_DIRECTORIES} : ${ODBC_LIBRARIES}")
266+
endif()
263267
include (cmake/find_poco.cmake)
264268
include (cmake/find_lz4.cmake)
265269
include (cmake/find_sparsehash.cmake)

0 commit comments

Comments
 (0)