sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-22 00:06:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Only build and use odbccpp_static

Browse Source
This commit is contained in:
Stefan Uhrig 2021-01-12 21:00:29 +01:00
parent d4494e5b43
commit 4bf57f76e1
3 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -246,7 +246,7 @@ if(WITH_CORE)
if(ODBC_FOUND)
set(HAVE_HANA TRUE)
add_subdirectory(external/odbccpp)
set_target_properties(odbccpp odbccpp_static PROPERTIES AUTOMOC OFF AUTOUIC OFF AUTORCC OFF)
set_target_properties(odbccpp_static PROPERTIES AUTOMOC OFF AUTOUIC OFF AUTORCC OFF)
else()
message(STATUS "Couldn't find ODBC library")
endif()

22
external/odbccpp/src/odbc/CMakeLists.txt vendored
View File

@ -55,25 +55,3 @@ TARGET_COMPILE_DEFINITIONS(odbccpp_static
ODBC_STATIC
)
SET_PROPERTY(TARGET odbccpp_static PROPERTY POSITION_INDEPENDENT_CODE ON)
# Shared library
ADD_LIBRARY(odbccpp
SHARED
${odbccpp_sources}
)
TARGET_COMPILE_DEFINITIONS(odbccpp
PRIVATE
ODBC_EXPORTS
)
TARGET_LINK_LIBRARIES(odbccpp
PUBLIC
${ODBC_LIBRARIES}
)
SET_PROPERTY(TARGET odbccpp PROPERTY public_headers ${public_headers})
# Installation
INSTALL(TARGETS odbccpp_static DESTINATION lib)
INSTALL(TARGETS odbccpp DESTINATION lib)
INSTALL(FILES ${public_headers} DESTINATION include/odbc)

4
src/providers/hana/CMakeLists.txt
View File

@ -97,13 +97,13 @@ TARGET_COMPILE_DEFINITIONS(hanaprovider_a PUBLIC ODBC_STATIC)
TARGET_LINK_LIBRARIES(hanaprovider
qgis_core
odbccpp
odbccpp_static
${ODBC_LIBRARIES}
)
TARGET_LINK_LIBRARIES(hanaprovider_a
qgis_core
odbccpp
odbccpp_static
${ODBC_LIBRARIES}
)