65 lines
3.9 KiB
Diff
65 lines
3.9 KiB
Diff
diff -crN '--exclude=.git' '--exclude=.gitee' '--exclude=.vscode' opengauss_server_600/src/bin/gs_persist/CMakeLists.txt opengauss_server_600_edit/src/bin/gs_persist/CMakeLists.txt
|
|
*** opengauss_server_600/src/bin/gs_persist/CMakeLists.txt 2024-11-19 20:01:27.693621300 +0800
|
|
--- opengauss_server_600_edit/src/bin/gs_persist/CMakeLists.txt 2024-11-19 20:04:07.089621300 +0800
|
|
***************
|
|
*** 13,19 ****
|
|
set(gssgpersist_DEF_OPTIONS ${MACRO_OPTIONS})
|
|
set(gssgpersist_COMPILE_OPTIONS ${OPTIMIZE_OPTIONS} ${OS_OPTIONS} ${PROTECT_OPTIONS} ${WARNING_OPTIONS} ${BIN_SECURE_OPTIONS} ${CHECK_OPTIONS})
|
|
set(gssgpersist_LINK_OPTIONS ${BIN_LINK_OPTIONS})
|
|
! set(gssgpersist_LINK_LIBS -lsecurec -ldl -lrt)
|
|
|
|
if("${ENABLE_UT}" STREQUAL "ON")
|
|
add_shared_libtarget(ut_gs_persist_lib tgt_gssgpersist_SRC tgt_gssgpersist_INC "${gssgpersist_DEF_OPTIONS}" "${gssgpersist_COMPILE_OPTIONS}" "${gssgpersist_LINK_OPTIONS}")
|
|
--- 13,19 ----
|
|
set(gssgpersist_DEF_OPTIONS ${MACRO_OPTIONS})
|
|
set(gssgpersist_COMPILE_OPTIONS ${OPTIMIZE_OPTIONS} ${OS_OPTIONS} ${PROTECT_OPTIONS} ${WARNING_OPTIONS} ${BIN_SECURE_OPTIONS} ${CHECK_OPTIONS})
|
|
set(gssgpersist_LINK_OPTIONS ${BIN_LINK_OPTIONS})
|
|
! set(gssgpersist_LINK_LIBS -l${SECURE_C_CHECK} -ldl -lrt)
|
|
|
|
if("${ENABLE_UT}" STREQUAL "ON")
|
|
add_shared_libtarget(ut_gs_persist_lib tgt_gssgpersist_SRC tgt_gssgpersist_INC "${gssgpersist_DEF_OPTIONS}" "${gssgpersist_COMPILE_OPTIONS}" "${gssgpersist_LINK_OPTIONS}")
|
|
diff -crN '--exclude=.git' '--exclude=.gitee' '--exclude=.vscode' opengauss_server_600/src/common/interfaces/libpq/CMakeLists.txt opengauss_server_600_edit/src/common/interfaces/libpq/CMakeLists.txt
|
|
*** opengauss_server_600/src/common/interfaces/libpq/CMakeLists.txt 2024-11-19 20:01:27.697621300 +0800
|
|
--- opengauss_server_600_edit/src/common/interfaces/libpq/CMakeLists.txt 2024-11-19 20:04:07.441621300 +0800
|
|
***************
|
|
*** 118,126 ****
|
|
set(pq_LINK_OPTIONS ${LIB_LINK_OPTIONS})
|
|
add_shared_libtarget(pq TGT_pq_SRC TGT_pq_INC "${pq_DEF_OPTIONS}" "${pq_COMPILE_OPTIONS}" "${pq_LINK_OPTIONS}")
|
|
if(NOT "${ENABLE_LITE_MODE}" STREQUAL "ON")
|
|
! target_link_libraries(pq PRIVATE com_err_gauss crypto gssapi_krb5_gauss gssrpc_gauss k5crypto_gauss krb5_gauss krb5support_gauss securec ssl)
|
|
else()
|
|
! target_link_libraries(pq PRIVATE crypto securec ssl)
|
|
endif()
|
|
target_link_directories(pq PUBLIC
|
|
${LIBOPENSSL_LIB_PATH} ${KERBEROS_LIB_PATH} ${SECURE_LIB_PATH}
|
|
--- 118,126 ----
|
|
set(pq_LINK_OPTIONS ${LIB_LINK_OPTIONS})
|
|
add_shared_libtarget(pq TGT_pq_SRC TGT_pq_INC "${pq_DEF_OPTIONS}" "${pq_COMPILE_OPTIONS}" "${pq_LINK_OPTIONS}")
|
|
if(NOT "${ENABLE_LITE_MODE}" STREQUAL "ON")
|
|
! target_link_libraries(pq PRIVATE com_err_gauss crypto gssapi_krb5_gauss gssrpc_gauss k5crypto_gauss krb5_gauss krb5support_gauss ${SECURE_C_CHECK} ssl)
|
|
else()
|
|
! target_link_libraries(pq PRIVATE crypto ${SECURE_C_CHECK} ssl)
|
|
endif()
|
|
target_link_directories(pq PUBLIC
|
|
${LIBOPENSSL_LIB_PATH} ${KERBEROS_LIB_PATH} ${SECURE_LIB_PATH}
|
|
diff -crN '--exclude=.git' '--exclude=.gitee' '--exclude=.vscode' opengauss_server_600/src/gausskernel/security/keymgr/CMakeLists.txt opengauss_server_600_edit/src/gausskernel/security/keymgr/CMakeLists.txt
|
|
*** opengauss_server_600/src/gausskernel/security/keymgr/CMakeLists.txt 2024-11-19 20:01:27.705621300 +0800
|
|
--- opengauss_server_600_edit/src/gausskernel/security/keymgr/CMakeLists.txt 2024-11-19 20:04:07.773621300 +0800
|
|
***************
|
|
*** 64,70 ****
|
|
if("${ENABLE_KT}" STREQUAL "ON")
|
|
add_dependencies(keymgr gs_ktool)
|
|
endif()
|
|
! set(libkey_LINKS -lcjson -lcurl -lsecurec -lssl -lcrypto -ldl -lrt)
|
|
if("${ENABLE_KT}" STREQUAL "ON")
|
|
list(APPEND libkey_LINKS -lgs_ktool -lkmc)
|
|
endif()
|
|
--- 64,70 ----
|
|
if("${ENABLE_KT}" STREQUAL "ON")
|
|
add_dependencies(keymgr gs_ktool)
|
|
endif()
|
|
! set(libkey_LINKS -lcjson -lcurl -l${SECURE_C_CHECK} -lssl -lcrypto -ldl -lrt)
|
|
if("${ENABLE_KT}" STREQUAL "ON")
|
|
list(APPEND libkey_LINKS -lgs_ktool -lkmc)
|
|
endif()
|