database/openGauss-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!6684 修复非轻量版cmake不带dblink，以及dolphin插件无法使用问题

Browse Source 
Merge pull request !6684 from chenxiaobin/fixdolphincmake
This commit is contained in:
opengauss_bot
2024-11-19 01:36:51 +00:00
committed by Gitee
parent a9c38fe963 003953b12e
commit f6f33cd19e
4 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -36,6 +36,12 @@ endif()
if("${ENABLE_PRIVATEGAUSS}" STREQUAL "ON")
MESSAGE(FATAL_ERROR " The option ENABLE_PRIVATEGAUSS is not supported thus should be turned off.")
endif()
if("${ENABLE_LITE_MODE}" STREQUAL "")
set(ENABLE_LITE_MODE "OFF")
endif()
if("${ENABLE_MOT}" STREQUAL "")
set(ENABLE_MOT "OFF")
endif()
#FIXME: make it an argument
set(openGauss ".")
@ -107,7 +113,7 @@ install(DIRECTORY ${CMAKE_BINARY_DIR}/pg_plugin DESTINATION lib/postgresql)
install(DIRECTORY ${CMAKE_BINARY_DIR}/libsimsearch DESTINATION lib)
if(EXISTS ${CMAKE_SOURCE_DIR}/contrib/dolphin)
install(CODE "execute_process(COMMAND bash cmake.sh WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/contrib/dolphin)")
install(CODE "execute_process(COMMAND bash cmake.sh ${ENABLE_LITE_MODE} ${ENABLE_MOT} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/contrib/dolphin)")
install(FILES ${CMAKE_SOURCE_DIR}/contrib/dolphin/dolphin.control
DESTINATION share/postgresql/extension/
)

7
contrib/CMakeLists.txt
View File

@ -37,6 +37,13 @@ set(CMAKE_MODULE_PATH
${CMAKE_CURRENT_SOURCE_DIR}/gms_i18n
)
if(NOT "${ENABLE_LITE_MODE}" STREQUAL "ON")
INCLUDE_DIRECTORIES(${LIBODBC_INCLUDE_PATH})
INCLUDE_DIRECTORIES(${LIBODBC_LIB_PATH})
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/dblink)
add_subdirectory(dblink)
endif()
if("${USE_LIBXML}" STREQUAL "ON")
INCLUDE_DIRECTORIES(${LIBXML_INCLUDE_PATH}/libxml2)
INCLUDE_DIRECTORIES(${LIBXML_LIB_PATH})

23
contrib/dblink/CMakeLists.txt Normal file
View File

@ -0,0 +1,23 @@
#This is the main CMAKE for build all gms_stats.
# gms_stats
AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} TGT_dblink_SRC)
set(TGT_dblink_INC
${PROJECT_OPENGS_DIR}/contrib/dblink
${PROJECT_OPENGS_DIR}/contrib
)
set(dblink_DEF_OPTIONS ${MACRO_OPTIONS})
set(dblink_COMPILE_OPTIONS ${OPTIMIZE_OPTIONS} ${OS_OPTIONS} ${PROTECT_OPTIONS} ${WARNING_OPTIONS} ${LIB_SECURE_OPTIONS} ${CHECK_OPTIONS})
set(dblink_LINK_OPTIONS ${LIB_LINK_OPTIONS})
add_shared_libtarget(dblink TGT_dblink_SRC TGT_dblink_INC "${dblink_DEF_OPTIONS}" "${dblink_COMPILE_OPTIONS}" "${dblink_LINK_OPTIONS}")
target_link_libraries(dblink PUBLIC -lodbc)
target_link_directories(dblink PUBLIC ${ODBC_HOME}/lib)
set_target_properties(dblink PROPERTIES PREFIX "")
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dblink.control
DESTINATION share/postgresql/extension/
)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dblink--1.0.sql
DESTINATION share/postgresql/extension/
)
install(TARGETS dblink DESTINATION lib/postgresql)

3
src/CMakeLists.txt
View File

@ -204,6 +204,9 @@ if(${ENABLE_MULTIPLE_NODES}_${ENABLE_PRIVATEGAUSS} STREQUAL OFF_OFF AND NOT ${EN
if(EXISTS ${DSS_BIN_PATH})
install(DIRECTORY ${DSS_BIN_PATH} DESTINATION . FILE_PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE)
endif()
if(EXISTS ${LIBODBC_LIB_PATH})
install(DIRECTORY ${LIBODBC_LIB_PATH} DESTINATION .)
endif()
endif()
install(DIRECTORY ${ZSTD_LIB_PATH} DESTINATION . PATTERN "*.a" EXCLUDE)