From 5b41c531de734bab5ff429d0a9bef0dbc111d34b Mon Sep 17 00:00:00 2001 From: Robert Schulze Date: Mon, 21 Aug 2023 07:50:53 +0000 Subject: [PATCH] Sort files --- contrib/openldap-cmake/CMakeLists.txt | 164 ++++++++++---------------- 1 file changed, 62 insertions(+), 102 deletions(-) diff --git a/contrib/openldap-cmake/CMakeLists.txt b/contrib/openldap-cmake/CMakeLists.txt index 4eec64f6098..c7d4b5a2ca2 100644 --- a/contrib/openldap-cmake/CMakeLists.txt +++ b/contrib/openldap-cmake/CMakeLists.txt @@ -96,84 +96,82 @@ target_compile_definitions(_lber ) set(_ldap_srcs - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/bind.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/open.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/result.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/avl.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/tavl.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/error.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/compare.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/search.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/controls.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/messages.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/references.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/extended.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/cyrus.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/modify.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/add.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/modrdn.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/delete.c" "${OPENLDAP_SOURCE_DIR}/libraries/libldap/abandon.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/sasl.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/sbind.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/unbind.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/add.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/addentry.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/assertion.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/avl.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/bind.c" "${OPENLDAP_SOURCE_DIR}/libraries/libldap/cancel.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/charray.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/compare.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/controls.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/cyrus.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/dds.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/delete.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/deref.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/dnssrv.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/error.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/extended.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/fetch.c" "${OPENLDAP_SOURCE_DIR}/libraries/libldap/filter.c" "${OPENLDAP_SOURCE_DIR}/libraries/libldap/free.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/sort.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/passwd.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/whoami.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/vc.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/getattr.c" "${OPENLDAP_SOURCE_DIR}/libraries/libldap/getdn.c" "${OPENLDAP_SOURCE_DIR}/libraries/libldap/getentry.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/getattr.c" "${OPENLDAP_SOURCE_DIR}/libraries/libldap/getvalues.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/addentry.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/request.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/os-ip.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/url.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/pagectrl.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/sortctrl.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/vlvctrl.c" "${OPENLDAP_SOURCE_DIR}/libraries/libldap/init.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/options.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/print.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/string.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/util-int.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/schema.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/charray.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/os-local.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/dnssrv.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/utf-8.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/utf-8-conv.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/tls2.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/tls_o.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/tls_g.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/turn.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/ppolicy.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/dds.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/txn.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/ldap_sync.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/stctrl.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/assertion.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/deref.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/ldifutil.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/ldif.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/fetch.c" "${OPENLDAP_SOURCE_DIR}/libraries/libldap/lbase64.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/ldap_sync.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/ldif.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/ldifutil.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/messages.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/modify.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/modrdn.c" "${OPENLDAP_SOURCE_DIR}/libraries/libldap/msctrl.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/open.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/options.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/os-ip.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/os-local.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/pagectrl.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/passwd.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/ppolicy.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/print.c" "${OPENLDAP_SOURCE_DIR}/libraries/libldap/psearchctrl.c" - - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/threads.c" "${OPENLDAP_SOURCE_DIR}/libraries/libldap/rdwr.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/tpool.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/references.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/request.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/result.c" "${OPENLDAP_SOURCE_DIR}/libraries/libldap/rq.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/thr_posix.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/thr_thr.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/thr_nt.c" - "${OPENLDAP_SOURCE_DIR}/libraries/libldap/thr_pth.c" - # "${OPENLDAP_SOURCE_DIR}/libraries/libldap/thr_stub.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/sasl.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/sbind.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/schema.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/search.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/sort.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/sortctrl.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/stctrl.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/string.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/tavl.c" "${OPENLDAP_SOURCE_DIR}/libraries/libldap/thr_debug.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/thr_nt.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/thr_posix.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/thr_pth.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/thr_thr.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/threads.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/tls2.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/tls_g.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/tls_o.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/tpool.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/turn.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/txn.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/unbind.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/url.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/utf-8-conv.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/utf-8.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/util-int.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/vc.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/vlvctrl.c" + "${OPENLDAP_SOURCE_DIR}/libraries/libldap/whoami.c" ) mkversion(ldap) @@ -198,43 +196,5 @@ target_compile_definitions(_ldap PRIVATE LDAP_LIBRARY ) -# set(_ldap_r_specific_srcs -# "${OPENLDAP_SOURCE_DIR}/libraries/libldap/threads.c" -# "${OPENLDAP_SOURCE_DIR}/libraries/libldap/rdwr.c" -# "${OPENLDAP_SOURCE_DIR}/libraries/libldap/tpool.c" -# "${OPENLDAP_SOURCE_DIR}/libraries/libldap/rq.c" -# "${OPENLDAP_SOURCE_DIR}/libraries/libldap/thr_posix.c" -# "${OPENLDAP_SOURCE_DIR}/libraries/libldap/thr_thr.c" -# "${OPENLDAP_SOURCE_DIR}/libraries/libldap/thr_nt.c" -# "${OPENLDAP_SOURCE_DIR}/libraries/libldap/thr_pth.c" -# # "${OPENLDAP_SOURCE_DIR}/libraries/libldap/thr_stub.c" -# "${OPENLDAP_SOURCE_DIR}/libraries/libldap/thr_debug.c" -# ) - -# mkversion(ldap_r) - -# add_library(_ldap_r -# ${_ldap_r_specific_srcs} -# ${_ldap_srcs} -# "${CMAKE_CURRENT_BINARY_DIR}/ldap_r-version.c" -# ) - -# target_link_libraries(_ldap_r -# PRIVATE _lber -# PRIVATE OpenSSL::Crypto OpenSSL::SSL -# ) - -# target_include_directories(_ldap_r SYSTEM -# PUBLIC ${_extra_build_dir}/include -# PUBLIC "${OPENLDAP_SOURCE_DIR}/include" -# PRIVATE "${OPENLDAP_SOURCE_DIR}/libraries/libldap_r" -# PRIVATE "${OPENLDAP_SOURCE_DIR}/libraries/libldap" -# ) - -# target_compile_definitions(_ldap_r -# PRIVATE LDAP_R_COMPILE -# PRIVATE LDAP_LIBRARY -# ) - add_library(ch_contrib::ldap ALIAS _ldap) add_library(ch_contrib::lber ALIAS _lber)