You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by iv...@apache.org on 2024/09/14 18:52:19 UTC
svn commit: r1920655 - in /apr/apr-util/branches/1.7.x: .github/workflows/windows.yml CMakeLists.txt README.cmake
Author: ivan
Date: Sat Sep 14 18:52:19 2024
New Revision: 1920655
URL: http://svn.apache.org/viewvc?rev=1920655&view=rev
Log:
CMake: Rename APR_BUILD_TESTAPR to APU_BUILD_TEST.
Modified:
apr/apr-util/branches/1.7.x/.github/workflows/windows.yml
apr/apr-util/branches/1.7.x/CMakeLists.txt
apr/apr-util/branches/1.7.x/README.cmake
Modified: apr/apr-util/branches/1.7.x/.github/workflows/windows.yml
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.7.x/.github/workflows/windows.yml?rev=1920655&r1=1920654&r2=1920655&view=diff
==============================================================================
--- apr/apr-util/branches/1.7.x/.github/workflows/windows.yml (original)
+++ apr/apr-util/branches/1.7.x/.github/workflows/windows.yml Sat Sep 14 18:52:19 2024
@@ -143,7 +143,7 @@ jobs:
-DCMAKE_BUILD_TYPE=${{ matrix.build-type }} ^
-DBUILD_SHARED_LIBS=${{ matrix.build-shared }} ^
-DAPU_DSO_BUILD=${{ matrix.dso-build }} ^
- -DAPR_BUILD_TESTAPR=ON ^
+ -DAPU_BUILD_TEST=ON ^
-DAPR_HAS_LDAP=OFF ^
-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake ^
-DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/install ^
Modified: apr/apr-util/branches/1.7.x/CMakeLists.txt
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.7.x/CMakeLists.txt?rev=1920655&r1=1920654&r2=1920655&view=diff
==============================================================================
--- apr/apr-util/branches/1.7.x/CMakeLists.txt (original)
+++ apr/apr-util/branches/1.7.x/CMakeLists.txt Sat Sep 14 18:52:19 2024
@@ -41,7 +41,7 @@ OPTION(APU_HAVE_ODBC "Build ODBC
OPTION(APU_HAVE_SQLITE3 "Build SQLite3 DBD driver" OFF)
OPTION(APR_HAS_LDAP "LDAP support" ON)
OPTION(INSTALL_PDB "Install .pdb files (if generated)" ON)
-OPTION(APR_BUILD_TESTAPR "Build the test suite" OFF)
+OPTION(APU_BUILD_TEST "Build the test suite" OFF)
SET(APU_INSTALL_BIN_DIR "bin" CACHE STRING "Install subdirectory for binary files")
SET(APU_INSTALL_LIB_DIR "lib" CACHE STRING "Install subdirectory for library files")
@@ -379,7 +379,7 @@ IF(APU_DSO_BUILD AND APU_HAVE_SQLITE3)
PRIVATE "DLL_NAME=apr_dbd_sqlite3-1")
ENDIF()
-IF(APR_BUILD_TESTAPR)
+IF(APU_BUILD_TEST)
ENABLE_TESTING()
# Create a "check" target that displays test program output to the console.
ADD_CUSTOM_TARGET(check COMMAND ${CMAKE_CTEST_COMMAND} --verbose)
@@ -426,7 +426,7 @@ IF(APR_BUILD_TESTAPR)
TARGET_LINK_LIBRARIES(memcachedmock ${whichapr})
ADD_DEPENDENCIES(testall memcachedmock)
-ENDIF (APR_BUILD_TESTAPR)
+ENDIF (APU_BUILD_TEST)
# Installation
@@ -464,4 +464,4 @@ MESSAGE(STATUS " APU_HAVE_CRYPTO ......
MESSAGE(STATUS " APR_HAS_LDAP .................... : ${APR_HAS_LDAP}")
MESSAGE(STATUS " Use Expat ....................... : ${APU_USE_EXPAT}")
MESSAGE(STATUS " Use LibXml2 ..................... : ${APU_USE_LIBXML2}")
-MESSAGE(STATUS " Build test suite ................ : ${APR_BUILD_TESTAPR}")
+MESSAGE(STATUS " Build test suite ................ : ${APU_BUILD_TEST}")
Modified: apr/apr-util/branches/1.7.x/README.cmake
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.7.x/README.cmake?rev=1920655&r1=1920654&r2=1920655&view=diff
==============================================================================
--- apr/apr-util/branches/1.7.x/README.cmake (original)
+++ apr/apr-util/branches/1.7.x/README.cmake Sat Sep 14 18:52:19 2024
@@ -79,7 +79,7 @@ How to build
Default: OFF
APU_HAVE_ODBC Build ODBC DBD driver
Default: ON
- APR_BUILD_TESTAPR Build APR-Util test suite
+ APU_BUILD_TEST Build APR-Util test suite
Default: OFF
TEST_STATIC_LIBS Build the test suite to test the APR static
library instead of the APR dynamic library.