Skip to content

Commit

Permalink
CMake: Rename APR_BUILD_TESTAPR to APU_BUILD_TEST.
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/branches/1.7.x@1920655 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
Ivan Zhakov committed Sep 14, 2024
1 parent 3bb6916 commit b11ee7f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 ^
Expand Down
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ OPTION(APU_HAVE_ODBC "Build ODBC DBD driver" ON)
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")
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -464,4 +464,4 @@ MESSAGE(STATUS " APU_HAVE_CRYPTO ................. : ${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}")
2 changes: 1 addition & 1 deletion README.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit b11ee7f

Please sign in to comment.