Author: rinrab Date: Thu May 7 09:13:47 2026 New Revision: 1933902 Log: Set svn:eol-style to native for the cmake modules.
* build/cmake/FindAPR.cmake * build/cmake/FindAPRUtil.cmake * build/cmake/FindHttpd.cmake * build/cmake/FindPY3C.cmake * build/cmake/FindSQLiteAmalgamation.cmake * build/cmake/FindSerf.cmake * build/cmake/FindXDIGEST.cmake * build/cmake/extractor.cmake (svn:eol-style): Set to native. Modified: subversion/trunk/build/cmake/FindAPR.cmake (contents, props changed) subversion/trunk/build/cmake/FindAPRUtil.cmake (contents, props changed) subversion/trunk/build/cmake/FindHttpd.cmake (contents, props changed) subversion/trunk/build/cmake/FindPY3C.cmake (contents, props changed) subversion/trunk/build/cmake/FindSQLiteAmalgamation.cmake (contents, props changed) subversion/trunk/build/cmake/FindSerf.cmake (contents, props changed) subversion/trunk/build/cmake/FindXDIGEST.cmake (props changed) subversion/trunk/build/cmake/extractor.cmake (contents, props changed) Modified: subversion/trunk/build/cmake/FindAPR.cmake ============================================================================== --- subversion/trunk/build/cmake/FindAPR.cmake Thu May 7 08:30:17 2026 (r1933901) +++ subversion/trunk/build/cmake/FindAPR.cmake Thu May 7 09:13:47 2026 (r1933902) @@ -1,110 +1,110 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# FindAPR.cmake -- CMake module for APR library -# - -find_path(APR_INCLUDE_DIR - NAMES apr.h - PATH_SUFFIXES - include - include/apr-2 - include/apr-2.0 - include/apr-1 - include/apr-1.0 -) - -if (APR_INCLUDE_DIR AND EXISTS ${APR_INCLUDE_DIR}/apr_version.h) - file( - STRINGS "${APR_INCLUDE_DIR}/apr_version.h" VERSION_STRINGS - REGEX "#define (APR_MAJOR_VERSION|APR_MINOR_VERSION|APR_PATCH_VERSION)" - ) - - string(REGEX REPLACE ".*APR_MAJOR_VERSION +([0-9]+).*" "\\1" APR_MAJOR_VERSION ${VERSION_STRINGS}) - string(REGEX REPLACE ".*APR_MINOR_VERSION +([0-9]+).*" "\\1" APR_MINOR_VERSION ${VERSION_STRINGS}) - string(REGEX REPLACE ".*APR_PATCH_VERSION +([0-9]+).*" "\\1" APR_PATCH_VERSION ${VERSION_STRINGS}) -else() - # Default version to 1.0.0 if not found. - set(APR_MAJOR_VERSION 1) - set(APR_MINOR_VERSION 0) - set(APR_PATCH_VERSION 0) -endif() - -set(APR_VERSION "${APR_MAJOR_VERSION}.${APR_MINOR_VERSION}.${APR_PATCH_VERSION}") - -find_library(APR_LIBRARY_SHARED - NAMES libapr-${APR_MAJOR_VERSION} - PATH_SUFFIXES lib -) - -find_library(APR_LIBRARY_STATIC - NAMES apr-${APR_MAJOR_VERSION} - PATH_SUFFIXES lib -) - -find_file(APR_DLL - NAMES libapr-${APR_MAJOR_VERSION}.dll - PATH_SUFFIXES bin -) - -mark_as_advanced( - APR_INCLUDE_DIR - APR_LIBRARY_SHARED - APR_LIBRARY_STATIC - APR_DLL -) - -if(APR_LIBRARY_SHARED) - set(APR_LIBRARY ${APR_LIBRARY_SHARED}) -elseif(APR_LIBRARY_STATIC) - set(APR_LIBRARY ${APR_LIBRARY_STATIC}) -endif() - -include(FindPackageHandleStandardArgs) - -FIND_PACKAGE_HANDLE_STANDARD_ARGS( - APR - REQUIRED_VARS - APR_LIBRARY - APR_INCLUDE_DIR - VERSION_VAR - APR_VERSION -) - -if(APR_FOUND AND NOT TARGET apr::apr) - if (APR_LIBRARY_SHARED) - add_library(apr::apr SHARED IMPORTED) - set_target_properties(apr::apr PROPERTIES - IMPORTED_LOCATION ${APR_DLL} - IMPORTED_IMPLIB ${APR_LIBRARY} - INTERFACE_COMPILE_DEFINITIONS "APR_DECLARE_IMPORT" - ) - else() - add_library(apr::apr STATIC IMPORTED) - set_target_properties(apr::apr PROPERTIES - IMPORTED_LOCATION ${APR_LIBRARY} - INTERFACE_COMPILE_DEFINITIONS "APR_DECLARE_STATIC" - ) - endif() - - target_include_directories(apr::apr INTERFACE ${APR_INCLUDE_DIR}) - - if (WIN32) - target_link_libraries(apr::apr INTERFACE ws2_32 rpcrt4) - endif() -endif() +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# FindAPR.cmake -- CMake module for APR library +# + +find_path(APR_INCLUDE_DIR + NAMES apr.h + PATH_SUFFIXES + include + include/apr-2 + include/apr-2.0 + include/apr-1 + include/apr-1.0 +) + +if (APR_INCLUDE_DIR AND EXISTS ${APR_INCLUDE_DIR}/apr_version.h) + file( + STRINGS "${APR_INCLUDE_DIR}/apr_version.h" VERSION_STRINGS + REGEX "#define (APR_MAJOR_VERSION|APR_MINOR_VERSION|APR_PATCH_VERSION)" + ) + + string(REGEX REPLACE ".*APR_MAJOR_VERSION +([0-9]+).*" "\\1" APR_MAJOR_VERSION ${VERSION_STRINGS}) + string(REGEX REPLACE ".*APR_MINOR_VERSION +([0-9]+).*" "\\1" APR_MINOR_VERSION ${VERSION_STRINGS}) + string(REGEX REPLACE ".*APR_PATCH_VERSION +([0-9]+).*" "\\1" APR_PATCH_VERSION ${VERSION_STRINGS}) +else() + # Default version to 1.0.0 if not found. + set(APR_MAJOR_VERSION 1) + set(APR_MINOR_VERSION 0) + set(APR_PATCH_VERSION 0) +endif() + +set(APR_VERSION "${APR_MAJOR_VERSION}.${APR_MINOR_VERSION}.${APR_PATCH_VERSION}") + +find_library(APR_LIBRARY_SHARED + NAMES libapr-${APR_MAJOR_VERSION} + PATH_SUFFIXES lib +) + +find_library(APR_LIBRARY_STATIC + NAMES apr-${APR_MAJOR_VERSION} + PATH_SUFFIXES lib +) + +find_file(APR_DLL + NAMES libapr-${APR_MAJOR_VERSION}.dll + PATH_SUFFIXES bin +) + +mark_as_advanced( + APR_INCLUDE_DIR + APR_LIBRARY_SHARED + APR_LIBRARY_STATIC + APR_DLL +) + +if(APR_LIBRARY_SHARED) + set(APR_LIBRARY ${APR_LIBRARY_SHARED}) +elseif(APR_LIBRARY_STATIC) + set(APR_LIBRARY ${APR_LIBRARY_STATIC}) +endif() + +include(FindPackageHandleStandardArgs) + +FIND_PACKAGE_HANDLE_STANDARD_ARGS( + APR + REQUIRED_VARS + APR_LIBRARY + APR_INCLUDE_DIR + VERSION_VAR + APR_VERSION +) + +if(APR_FOUND AND NOT TARGET apr::apr) + if (APR_LIBRARY_SHARED) + add_library(apr::apr SHARED IMPORTED) + set_target_properties(apr::apr PROPERTIES + IMPORTED_LOCATION ${APR_DLL} + IMPORTED_IMPLIB ${APR_LIBRARY} + INTERFACE_COMPILE_DEFINITIONS "APR_DECLARE_IMPORT" + ) + else() + add_library(apr::apr STATIC IMPORTED) + set_target_properties(apr::apr PROPERTIES + IMPORTED_LOCATION ${APR_LIBRARY} + INTERFACE_COMPILE_DEFINITIONS "APR_DECLARE_STATIC" + ) + endif() + + target_include_directories(apr::apr INTERFACE ${APR_INCLUDE_DIR}) + + if (WIN32) + target_link_libraries(apr::apr INTERFACE ws2_32 rpcrt4) + endif() +endif() Modified: subversion/trunk/build/cmake/FindAPRUtil.cmake ============================================================================== --- subversion/trunk/build/cmake/FindAPRUtil.cmake Thu May 7 08:30:17 2026 (r1933901) +++ subversion/trunk/build/cmake/FindAPRUtil.cmake Thu May 7 09:13:47 2026 (r1933902) @@ -1,99 +1,99 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# FindAPRUtil.cmake -- CMake module for APR-Util library -# - -find_path(APRUTIL_INCLUDE_DIR - NAMES apu.h - PATH_SUFFIXES - include - include/apr-1 # Not yet in apr - include/apr-1.0 -) - -find_library(APRUTIL_LIBRARY_SHARED - NAMES libaprutil-1 - PATH_SUFFIXES lib -) - -find_library(APRUTIL_LIBRARY_STATIC - NAMES aprutil-1 - PATH_SUFFIXES lib -) - -find_file(APRUTIL_DLL - NAMES libaprutil-1.dll - PATH_SUFFIXES bin -) - -mark_as_advanced( - APRUTIL_INCLUDE_DIR - APRUTIL_LIBRARY_SHARED - APRUTIL_LIBRARY_STATIC - APRUTIL_DLL -) - -if(APRUTIL_LIBRARY_SHARED) - set(APRUTIL_LIBRARY ${APRUTIL_LIBRARY_SHARED}) -elseif(APRUTIL_LIBRARY_STATIC) - set(APRUTIL_LIBRARY ${APRUTIL_LIBRARY_STATIC}) -endif() - -if (APRUTIL_INCLUDE_DIR AND EXISTS "${APRUTIL_INCLUDE_DIR}/apu_version.h") - file( - STRINGS "${APRUTIL_INCLUDE_DIR}/apu_version.h" VERSION_STRINGS - REGEX "#define (APU_MAJOR_VERSION|APU_MINOR_VERSION|APU_PATCH_VERSION)" - ) - - string(REGEX REPLACE ".*APU_MAJOR_VERSION +([0-9]+).*" "\\1" APU_MAJOR_VERSION ${VERSION_STRINGS}) - string(REGEX REPLACE ".*APU_MINOR_VERSION +([0-9]+).*" "\\1" APU_MINOR_VERSION ${VERSION_STRINGS}) - string(REGEX REPLACE ".*APU_PATCH_VERSION +([0-9]+).*" "\\1" APU_PATCH_VERSION ${VERSION_STRINGS}) - - set(APRUTIL_VERSION "${APU_MAJOR_VERSION}.${APU_MINOR_VERSION}.${APU_PATCH_VERSION}") -endif() - -include(FindPackageHandleStandardArgs) - -FIND_PACKAGE_HANDLE_STANDARD_ARGS( - APRUtil - REQUIRED_VARS - APRUTIL_LIBRARY - APRUTIL_INCLUDE_DIR - VERSION_VAR - APRUTIL_VERSION -) - -if(APRUtil_FOUND AND NOT TARGET apr::aprutil) - if (APRUTIL_LIBRARY_SHARED) - add_library(apr::aprutil SHARED IMPORTED) - set_target_properties(apr::aprutil PROPERTIES - IMPORTED_LOCATION ${APRUTIL_DLL} - IMPORTED_IMPLIB ${APRUTIL_LIBRARY} - INTERFACE_COMPILE_DEFINITIONS "APU_DECLARE_IMPORT" - ) - else() - add_library(apr::aprutil STATIC IMPORTED) - set_target_properties(apr::aprutil PROPERTIES - IMPORTED_LOCATION ${APRUTIL_LIBRARY} - INTERFACE_COMPILE_DEFINITIONS "APU_DECLARE_STATIC" - ) - endif() - - target_include_directories(apr::aprutil INTERFACE ${APRUTIL_INCLUDE_DIR}) -endif() +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# FindAPRUtil.cmake -- CMake module for APR-Util library +# + +find_path(APRUTIL_INCLUDE_DIR + NAMES apu.h + PATH_SUFFIXES + include + include/apr-1 # Not yet in apr + include/apr-1.0 +) + +find_library(APRUTIL_LIBRARY_SHARED + NAMES libaprutil-1 + PATH_SUFFIXES lib +) + +find_library(APRUTIL_LIBRARY_STATIC + NAMES aprutil-1 + PATH_SUFFIXES lib +) + +find_file(APRUTIL_DLL + NAMES libaprutil-1.dll + PATH_SUFFIXES bin +) + +mark_as_advanced( + APRUTIL_INCLUDE_DIR + APRUTIL_LIBRARY_SHARED + APRUTIL_LIBRARY_STATIC + APRUTIL_DLL +) + +if(APRUTIL_LIBRARY_SHARED) + set(APRUTIL_LIBRARY ${APRUTIL_LIBRARY_SHARED}) +elseif(APRUTIL_LIBRARY_STATIC) + set(APRUTIL_LIBRARY ${APRUTIL_LIBRARY_STATIC}) +endif() + +if (APRUTIL_INCLUDE_DIR AND EXISTS "${APRUTIL_INCLUDE_DIR}/apu_version.h") + file( + STRINGS "${APRUTIL_INCLUDE_DIR}/apu_version.h" VERSION_STRINGS + REGEX "#define (APU_MAJOR_VERSION|APU_MINOR_VERSION|APU_PATCH_VERSION)" + ) + + string(REGEX REPLACE ".*APU_MAJOR_VERSION +([0-9]+).*" "\\1" APU_MAJOR_VERSION ${VERSION_STRINGS}) + string(REGEX REPLACE ".*APU_MINOR_VERSION +([0-9]+).*" "\\1" APU_MINOR_VERSION ${VERSION_STRINGS}) + string(REGEX REPLACE ".*APU_PATCH_VERSION +([0-9]+).*" "\\1" APU_PATCH_VERSION ${VERSION_STRINGS}) + + set(APRUTIL_VERSION "${APU_MAJOR_VERSION}.${APU_MINOR_VERSION}.${APU_PATCH_VERSION}") +endif() + +include(FindPackageHandleStandardArgs) + +FIND_PACKAGE_HANDLE_STANDARD_ARGS( + APRUtil + REQUIRED_VARS + APRUTIL_LIBRARY + APRUTIL_INCLUDE_DIR + VERSION_VAR + APRUTIL_VERSION +) + +if(APRUtil_FOUND AND NOT TARGET apr::aprutil) + if (APRUTIL_LIBRARY_SHARED) + add_library(apr::aprutil SHARED IMPORTED) + set_target_properties(apr::aprutil PROPERTIES + IMPORTED_LOCATION ${APRUTIL_DLL} + IMPORTED_IMPLIB ${APRUTIL_LIBRARY} + INTERFACE_COMPILE_DEFINITIONS "APU_DECLARE_IMPORT" + ) + else() + add_library(apr::aprutil STATIC IMPORTED) + set_target_properties(apr::aprutil PROPERTIES + IMPORTED_LOCATION ${APRUTIL_LIBRARY} + INTERFACE_COMPILE_DEFINITIONS "APU_DECLARE_STATIC" + ) + endif() + + target_include_directories(apr::aprutil INTERFACE ${APRUTIL_INCLUDE_DIR}) +endif() Modified: subversion/trunk/build/cmake/FindHttpd.cmake ============================================================================== --- subversion/trunk/build/cmake/FindHttpd.cmake Thu May 7 08:30:17 2026 (r1933901) +++ subversion/trunk/build/cmake/FindHttpd.cmake Thu May 7 09:13:47 2026 (r1933902) @@ -1,62 +1,62 @@ -find_path(HTTPD_INCLUDE_DIR - NAMES httpd.h - PATH_SUFFIXES - include -) - -find_library(HTTPD_LIBRARY - NAMES libhttpd - PATH_SUFFIXES lib -) - -find_file(HTTPD_DLL - NAMES libhttpd.dll - PATH_SUFFIXES bin -) - -find_library(MOD_DAV_LIBRARY - NAMES mod_dav - PATH_SUFFIXES lib -) - -if (HTTPD_INCLUDE_DIR AND EXISTS "${HTTPD_INCLUDE_DIR}/ap_release.h") - file( - STRINGS "${HTTPD_INCLUDE_DIR}/ap_release.h" VERSION_STRINGS - REGEX "#define (AP_SERVER_MAJORVERSION_NUMBER|AP_SERVER_MINORVERSION_NUMBER|AP_SERVER_PATCHLEVEL_NUMBER)" - ) - - string(REGEX REPLACE ".*AP_SERVER_MAJORVERSION_NUMBER +([0-9]+).*" "\\1" HTTPD_VERSION_MAJOR ${VERSION_STRINGS}) - string(REGEX REPLACE ".*AP_SERVER_MINORVERSION_NUMBER +([0-9]+).*" "\\1" HTTPD_VERSION_MINOR ${VERSION_STRINGS}) - string(REGEX REPLACE ".*AP_SERVER_PATCHLEVEL_NUMBER +([0-9]+).*" "\\1" HTTPD_VERSION_PATCH ${VERSION_STRINGS}) - - set(HTTPD_VERSION "${HTTPD_VERSION_MAJOR}.${HTTPD_VERSION_MINOR}.${HTTPD_VERSION_PATCH}") -endif() - -FIND_PACKAGE_HANDLE_STANDARD_ARGS( - Httpd - REQUIRED_VARS - HTTPD_LIBRARY - HTTPD_INCLUDE_DIR - MOD_DAV_LIBRARY - VERSION_VAR - HTTPD_VERSION -) - -if(HTTPD_FOUND) - if(NOT TARGET httpd::httpd) - add_library(httpd::httpd SHARED IMPORTED) - set_target_properties(httpd::httpd PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES ${HTTPD_INCLUDE_DIR} - IMPORTED_LOCATION ${HTTPD_DLL} - IMPORTED_IMPLIB ${HTTPD_LIBRARY} - ) - endif() - - if(NOT TARGET httpd::mod_dav) - add_library(httpd::mod_dav STATIC IMPORTED) - set_target_properties(httpd::mod_dav PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES ${HTTPD_INCLUDE_DIR} - IMPORTED_LOCATION ${MOD_DAV_LIBRARY} - ) - endif() -endif() +find_path(HTTPD_INCLUDE_DIR + NAMES httpd.h + PATH_SUFFIXES + include +) + +find_library(HTTPD_LIBRARY + NAMES libhttpd + PATH_SUFFIXES lib +) + +find_file(HTTPD_DLL + NAMES libhttpd.dll + PATH_SUFFIXES bin +) + +find_library(MOD_DAV_LIBRARY + NAMES mod_dav + PATH_SUFFIXES lib +) + +if (HTTPD_INCLUDE_DIR AND EXISTS "${HTTPD_INCLUDE_DIR}/ap_release.h") + file( + STRINGS "${HTTPD_INCLUDE_DIR}/ap_release.h" VERSION_STRINGS + REGEX "#define (AP_SERVER_MAJORVERSION_NUMBER|AP_SERVER_MINORVERSION_NUMBER|AP_SERVER_PATCHLEVEL_NUMBER)" + ) + + string(REGEX REPLACE ".*AP_SERVER_MAJORVERSION_NUMBER +([0-9]+).*" "\\1" HTTPD_VERSION_MAJOR ${VERSION_STRINGS}) + string(REGEX REPLACE ".*AP_SERVER_MINORVERSION_NUMBER +([0-9]+).*" "\\1" HTTPD_VERSION_MINOR ${VERSION_STRINGS}) + string(REGEX REPLACE ".*AP_SERVER_PATCHLEVEL_NUMBER +([0-9]+).*" "\\1" HTTPD_VERSION_PATCH ${VERSION_STRINGS}) + + set(HTTPD_VERSION "${HTTPD_VERSION_MAJOR}.${HTTPD_VERSION_MINOR}.${HTTPD_VERSION_PATCH}") +endif() + +FIND_PACKAGE_HANDLE_STANDARD_ARGS( + Httpd + REQUIRED_VARS + HTTPD_LIBRARY + HTTPD_INCLUDE_DIR + MOD_DAV_LIBRARY + VERSION_VAR + HTTPD_VERSION +) + +if(HTTPD_FOUND) + if(NOT TARGET httpd::httpd) + add_library(httpd::httpd SHARED IMPORTED) + set_target_properties(httpd::httpd PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES ${HTTPD_INCLUDE_DIR} + IMPORTED_LOCATION ${HTTPD_DLL} + IMPORTED_IMPLIB ${HTTPD_LIBRARY} + ) + endif() + + if(NOT TARGET httpd::mod_dav) + add_library(httpd::mod_dav STATIC IMPORTED) + set_target_properties(httpd::mod_dav PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES ${HTTPD_INCLUDE_DIR} + IMPORTED_LOCATION ${MOD_DAV_LIBRARY} + ) + endif() +endif() Modified: subversion/trunk/build/cmake/FindPY3C.cmake ============================================================================== --- subversion/trunk/build/cmake/FindPY3C.cmake Thu May 7 08:30:17 2026 (r1933901) +++ subversion/trunk/build/cmake/FindPY3C.cmake Thu May 7 09:13:47 2026 (r1933902) @@ -1,46 +1,46 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# FindPY3C.cmake -- CMake module for py3c library -# - -find_path(PY3C_INCLUDE_DIR - NAMES py3c.h - PATH_SUFFIXES - "include/py3c" -) - -mark_as_advanced( - PY3C_INCLUDE_DIR -) - -include(FindPackageHandleStandardArgs) - -FIND_PACKAGE_HANDLE_STANDARD_ARGS( - PY3C - REQUIRED_VARS - PY3C_INCLUDE_DIR -) - -# TODO: Is it okay to put py3c into 'Python' namespace? -if(PY3C_FOUND AND NOT TARGET Python::py3c) - add_library(Python::py3c IMPORTED INTERFACE) - set_target_properties(Python::py3c PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES ${PY3C_INCLUDE_DIR} - ) -endif() +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# FindPY3C.cmake -- CMake module for py3c library +# + +find_path(PY3C_INCLUDE_DIR + NAMES py3c.h + PATH_SUFFIXES + "include/py3c" +) + +mark_as_advanced( + PY3C_INCLUDE_DIR +) + +include(FindPackageHandleStandardArgs) + +FIND_PACKAGE_HANDLE_STANDARD_ARGS( + PY3C + REQUIRED_VARS + PY3C_INCLUDE_DIR +) + +# TODO: Is it okay to put py3c into 'Python' namespace? +if(PY3C_FOUND AND NOT TARGET Python::py3c) + add_library(Python::py3c IMPORTED INTERFACE) + set_target_properties(Python::py3c PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES ${PY3C_INCLUDE_DIR} + ) +endif() Modified: subversion/trunk/build/cmake/FindSQLiteAmalgamation.cmake ============================================================================== --- subversion/trunk/build/cmake/FindSQLiteAmalgamation.cmake Thu May 7 08:30:17 2026 (r1933901) +++ subversion/trunk/build/cmake/FindSQLiteAmalgamation.cmake Thu May 7 09:13:47 2026 (r1933902) @@ -1,54 +1,54 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# FindSQLiteAmalgamation.cmake -- CMake module for the SQLite Amalgamation -# - -find_path(SQLITE_AMALGAMATION_DIR - NAMES sqlite3.c -) - -mark_as_advanced(SQLITE_AMALGAMATION_DIR) - -if (SQLITE_AMALGAMATION_DIR AND EXISTS "${SQLITE_AMALGAMATION_DIR}/sqlite3.c") - file(STRINGS "${SQLITE_AMALGAMATION_DIR}/sqlite3.c" _ver_line - REGEX "^#define SQLITE_VERSION *\"[0-9]+\\.[0-9]+\\.[0-9]+\"" - LIMIT_COUNT 1) - string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" - SQLite3_VERSION "${_ver_line}") - unset(_ver_line) -endif() - -include(FindPackageHandleStandardArgs) - -find_package_handle_standard_args( - SQLiteAmalgamation - REQUIRED_VARS - SQLITE_AMALGAMATION_DIR - VERSION_VAR - SQLite3_VERSION -) - -if(SQLiteAmalgamation_FOUND AND NOT TARGET SQLite::SQLite3Amalgamation) - add_library(SQLite::SQLite3Amalgamation IMPORTED INTERFACE) - - target_include_directories(SQLite::SQLite3Amalgamation INTERFACE ${SQLITE_AMALGAMATION_DIR}) - - # TODO: maybe drop SVN_SQLITE_INLINE out of this module? - target_compile_definitions(SQLite::SQLite3Amalgamation INTERFACE SVN_SQLITE_INLINE) -endif() +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# FindSQLiteAmalgamation.cmake -- CMake module for the SQLite Amalgamation +# + +find_path(SQLITE_AMALGAMATION_DIR + NAMES sqlite3.c +) + +mark_as_advanced(SQLITE_AMALGAMATION_DIR) + +if (SQLITE_AMALGAMATION_DIR AND EXISTS "${SQLITE_AMALGAMATION_DIR}/sqlite3.c") + file(STRINGS "${SQLITE_AMALGAMATION_DIR}/sqlite3.c" _ver_line + REGEX "^#define SQLITE_VERSION *\"[0-9]+\\.[0-9]+\\.[0-9]+\"" + LIMIT_COUNT 1) + string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" + SQLite3_VERSION "${_ver_line}") + unset(_ver_line) +endif() + +include(FindPackageHandleStandardArgs) + +find_package_handle_standard_args( + SQLiteAmalgamation + REQUIRED_VARS + SQLITE_AMALGAMATION_DIR + VERSION_VAR + SQLite3_VERSION +) + +if(SQLiteAmalgamation_FOUND AND NOT TARGET SQLite::SQLite3Amalgamation) + add_library(SQLite::SQLite3Amalgamation IMPORTED INTERFACE) + + target_include_directories(SQLite::SQLite3Amalgamation INTERFACE ${SQLITE_AMALGAMATION_DIR}) + + # TODO: maybe drop SVN_SQLITE_INLINE out of this module? + target_compile_definitions(SQLite::SQLite3Amalgamation INTERFACE SVN_SQLITE_INLINE) +endif() Modified: subversion/trunk/build/cmake/FindSerf.cmake ============================================================================== --- subversion/trunk/build/cmake/FindSerf.cmake Thu May 7 08:30:17 2026 (r1933901) +++ subversion/trunk/build/cmake/FindSerf.cmake Thu May 7 09:13:47 2026 (r1933902) @@ -1,106 +1,106 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# FindSerf.cmake -- CMake module for Serf library -# - -include(GNUInstallDirs) - -find_path(Serf_INCLUDE_DIR - NAMES serf.h - PATH_SUFFIXES - include - "${CMAKE_INSTALL_INCLUDEDIR}" - include/serf-2 - "${CMAKE_INSTALL_INCLUDEDIR}/serf-2" - include/serf-1 - "${CMAKE_INSTALL_INCLUDEDIR}/serf-1" -) - -mark_as_advanced( - Serf_INCLUDE_DIR - Serf_LIBRARY -) - -# TODO: Shared Serf - -if (Serf_INCLUDE_DIR AND EXISTS ${Serf_INCLUDE_DIR}/serf.h) - file( - STRINGS "${Serf_INCLUDE_DIR}/serf.h" VERSION_STRINGS - REGEX "#define (SERF_MAJOR_VERSION|SERF_MINOR_VERSION|SERF_PATCH_VERSION)" - ) - - string(REGEX REPLACE ".*SERF_MAJOR_VERSION +([0-9]+).*" "\\1" SERF_MAJOR_VERSION ${VERSION_STRINGS}) - string(REGEX REPLACE ".*SERF_MINOR_VERSION +([0-9]+).*" "\\1" SERF_MINOR_VERSION ${VERSION_STRINGS}) - string(REGEX REPLACE ".*SERF_PATCH_VERSION +([0-9]+).*" "\\1" SERF_PATCH_VERSION ${VERSION_STRINGS}) -else() - # Default version to 1.0.0 if not found. - set(SERF_MAJOR_VERSION 1) - set(SERF_MINOR_VERSION 0) - set(SERF_PATCH_VERSION 0) -endif() - -set(Serf_VERSION "${SERF_MAJOR_VERSION}.${SERF_MINOR_VERSION}.${SERF_PATCH_VERSION}") - -find_library(Serf_LIBRARY - NAMES "serf-${SERF_MAJOR_VERSION}" - PATH_SUFFIXES lib "${CMAKE_INSTALL_LIBDIR}" -) - -include(FindPackageHandleStandardArgs) - -find_package_handle_standard_args( - Serf - REQUIRED_VARS - Serf_LIBRARY - Serf_INCLUDE_DIR - VERSION_VAR - Serf_VERSION -) - -add_library(Serf::Serf STATIC IMPORTED) - -set_target_properties(Serf::Serf PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES ${Serf_INCLUDE_DIR} - IMPORTED_LOCATION ${Serf_LIBRARY} -) - -find_package(OpenSSL REQUIRED) -find_package(APR REQUIRED) -find_package(ZLIB REQUIRED) - -target_link_libraries(Serf::Serf INTERFACE - apr::apr - OpenSSL::SSL - ZLIB::ZLIB -) - -if(APR_VERSION VERSION_LESS 2.0.0) - find_package(APRUtil REQUIRED) - target_link_libraries(Serf::Serf INTERFACE apr::aprutil) -endif() - -if (WIN32) - target_link_libraries(Serf::Serf INTERFACE - crypt32.lib - rpcrt4.lib - mswsock.lib - secur32.lib - ws2_32.lib - ) -endif() +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# FindSerf.cmake -- CMake module for Serf library +# + +include(GNUInstallDirs) + +find_path(Serf_INCLUDE_DIR + NAMES serf.h + PATH_SUFFIXES + include + "${CMAKE_INSTALL_INCLUDEDIR}" + include/serf-2 + "${CMAKE_INSTALL_INCLUDEDIR}/serf-2" + include/serf-1 + "${CMAKE_INSTALL_INCLUDEDIR}/serf-1" +) + +mark_as_advanced( + Serf_INCLUDE_DIR + Serf_LIBRARY +) + +# TODO: Shared Serf + +if (Serf_INCLUDE_DIR AND EXISTS ${Serf_INCLUDE_DIR}/serf.h) + file( + STRINGS "${Serf_INCLUDE_DIR}/serf.h" VERSION_STRINGS + REGEX "#define (SERF_MAJOR_VERSION|SERF_MINOR_VERSION|SERF_PATCH_VERSION)" + ) + + string(REGEX REPLACE ".*SERF_MAJOR_VERSION +([0-9]+).*" "\\1" SERF_MAJOR_VERSION ${VERSION_STRINGS}) + string(REGEX REPLACE ".*SERF_MINOR_VERSION +([0-9]+).*" "\\1" SERF_MINOR_VERSION ${VERSION_STRINGS}) + string(REGEX REPLACE ".*SERF_PATCH_VERSION +([0-9]+).*" "\\1" SERF_PATCH_VERSION ${VERSION_STRINGS}) +else() + # Default version to 1.0.0 if not found. + set(SERF_MAJOR_VERSION 1) + set(SERF_MINOR_VERSION 0) + set(SERF_PATCH_VERSION 0) +endif() + +set(Serf_VERSION "${SERF_MAJOR_VERSION}.${SERF_MINOR_VERSION}.${SERF_PATCH_VERSION}") + +find_library(Serf_LIBRARY + NAMES "serf-${SERF_MAJOR_VERSION}" + PATH_SUFFIXES lib "${CMAKE_INSTALL_LIBDIR}" +) + +include(FindPackageHandleStandardArgs) + +find_package_handle_standard_args( + Serf + REQUIRED_VARS + Serf_LIBRARY + Serf_INCLUDE_DIR + VERSION_VAR + Serf_VERSION +) + +add_library(Serf::Serf STATIC IMPORTED) + +set_target_properties(Serf::Serf PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES ${Serf_INCLUDE_DIR} + IMPORTED_LOCATION ${Serf_LIBRARY} +) + +find_package(OpenSSL REQUIRED) +find_package(APR REQUIRED) +find_package(ZLIB REQUIRED) + +target_link_libraries(Serf::Serf INTERFACE + apr::apr + OpenSSL::SSL + ZLIB::ZLIB +) + +if(APR_VERSION VERSION_LESS 2.0.0) + find_package(APRUtil REQUIRED) + target_link_libraries(Serf::Serf INTERFACE apr::aprutil) +endif() + +if (WIN32) + target_link_libraries(Serf::Serf INTERFACE + crypt32.lib + rpcrt4.lib + mswsock.lib + secur32.lib + ws2_32.lib + ) +endif() Modified: subversion/trunk/build/cmake/extractor.cmake ============================================================================== --- subversion/trunk/build/cmake/extractor.cmake Thu May 7 08:30:17 2026 (r1933901) +++ subversion/trunk/build/cmake/extractor.cmake Thu May 7 09:13:47 2026 (r1933902) @@ -1,74 +1,74 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# extractor.cmake -- Extracts function names from header files and writes -# them to a .def file. -# -# cmake -DEXPORT_HEADER_FILE_PATHS=<...path_to_header_files> -# -DEXPORT_DEF_FILE_PATH=<path_to_def_file> -# [-DEXPORT_BLACKLIST=<...symbols_to_ignore>] -# -P extractor.cmake - -separate_arguments(EXPORT_HEADER_FILE_PATHS) -separate_arguments(EXPORT_BLACKLIST) - -# see build/generator/extractor.py -set(func_regex "(^|\n)((([A-Za-z0-9_]+|[*]) )+[*]?)?((svn|apr)_[A-Za-z0-9_]+)[ \t\r\n]*\\(") - -set(defs) -foreach(file ${EXPORT_HEADER_FILE_PATHS}) - file(READ ${file} contents) - string(REGEX MATCHALL "${func_regex}" funcs ${contents}) - - foreach(func_string ${funcs}) - string(REGEX MATCH "[A-Za-z0-9_]+[ \t\r\n]*\\($" func_name ${func_string}) - string(REGEX REPLACE "[ \t\r\n]*\\($" "" func_name ${func_name}) - list(APPEND defs "${func_name}") - endforeach() - - get_filename_component(filename ${file} NAME) - if(${filename} STREQUAL "svn_ctype.h") - # See libsvn_subr/ctype.c for an explanation why we use CONSTANT and not - # DATA, even though it causes an LNK4087 warning! - list(APPEND defs "svn_ctype_table = svn_ctype_table_internal CONSTANT") - elseif(${filename} STREQUAL "svn_wc_private.h") - # svn_wc__internal_walk_children() is now internal to libsvn_wc - # but entries-dump.c still calls it - list(APPEND defs "svn_wc__internal_walk_children") - endif() -endforeach() - -list(SORT defs) -list(REMOVE_DUPLICATES defs) - -set(def_file_content "EXPORTS\n") -foreach(def ${defs}) - list(FIND EXPORT_BLACKLIST "${def}" skip) - if(skip LESS 0) - string(APPEND def_file_content "${def}\n") - endif() -endforeach() - -if(EXISTS "${EXPORT_DEF_FILE_PATH}") - file(READ "${EXPORT_DEF_FILE_PATH}" old_file_content) -else() - set(old_file_content "NOT_EXISTS") -endif() -if(NOT ${old_file_content} STREQUAL ${def_file_content}) - file(WRITE "${EXPORT_DEF_FILE_PATH}" ${def_file_content}) -endif() +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# extractor.cmake -- Extracts function names from header files and writes +# them to a .def file. +# +# cmake -DEXPORT_HEADER_FILE_PATHS=<...path_to_header_files> +# -DEXPORT_DEF_FILE_PATH=<path_to_def_file> +# [-DEXPORT_BLACKLIST=<...symbols_to_ignore>] +# -P extractor.cmake + +separate_arguments(EXPORT_HEADER_FILE_PATHS) +separate_arguments(EXPORT_BLACKLIST) + +# see build/generator/extractor.py +set(func_regex "(^|\n)((([A-Za-z0-9_]+|[*]) )+[*]?)?((svn|apr)_[A-Za-z0-9_]+)[ \t\r\n]*\\(") + +set(defs) +foreach(file ${EXPORT_HEADER_FILE_PATHS}) + file(READ ${file} contents) + string(REGEX MATCHALL "${func_regex}" funcs ${contents}) + + foreach(func_string ${funcs}) + string(REGEX MATCH "[A-Za-z0-9_]+[ \t\r\n]*\\($" func_name ${func_string}) + string(REGEX REPLACE "[ \t\r\n]*\\($" "" func_name ${func_name}) + list(APPEND defs "${func_name}") + endforeach() + + get_filename_component(filename ${file} NAME) + if(${filename} STREQUAL "svn_ctype.h") + # See libsvn_subr/ctype.c for an explanation why we use CONSTANT and not + # DATA, even though it causes an LNK4087 warning! + list(APPEND defs "svn_ctype_table = svn_ctype_table_internal CONSTANT") + elseif(${filename} STREQUAL "svn_wc_private.h") + # svn_wc__internal_walk_children() is now internal to libsvn_wc + # but entries-dump.c still calls it + list(APPEND defs "svn_wc__internal_walk_children") + endif() +endforeach() + +list(SORT defs) +list(REMOVE_DUPLICATES defs) + +set(def_file_content "EXPORTS\n") +foreach(def ${defs}) + list(FIND EXPORT_BLACKLIST "${def}" skip) + if(skip LESS 0) + string(APPEND def_file_content "${def}\n") + endif() +endforeach() + +if(EXISTS "${EXPORT_DEF_FILE_PATH}") + file(READ "${EXPORT_DEF_FILE_PATH}" old_file_content) +else() + set(old_file_content "NOT_EXISTS") +endif() +if(NOT ${old_file_content} STREQUAL ${def_file_content}) + file(WRITE "${EXPORT_DEF_FILE_PATH}" ${def_file_content}) +endif()
