From b4197909d26042ece777727cc6152deeea75a3ab Mon Sep 17 00:00:00 2001 From: Ivan Zhakov Date: Wed, 29 May 2024 22:38:37 +0000 Subject: [PATCH] On '1.7.x' branch: Merge r1918047 from trunk: CMake: Follow-up to r1918043: Use CACHE STRING instead of CACHE PATH for APR_INSTALL_*_DIR options. git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1918048 13f79535-47bb-0310-9956-ffa450edef68 --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bde0be4d7c..9577f51425 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,9 +48,9 @@ OPTION(TEST_STATIC_LIBS "Test programs use APR static libraries instead of s SET(MIN_WINDOWS_VER "Vista" CACHE STRING "Minimum Windows version") -SET(APR_INSTALL_BIN_DIR "bin" CACHE PATH "Install subdirectory for binary files") -SET(APR_INSTALL_LIB_DIR "lib" CACHE PATH "Install subdirectory for library files") -SET(APR_INSTALL_INCLUDE_DIR "include" CACHE PATH "Install subdirectory for include files") +SET(APR_INSTALL_BIN_DIR "bin" CACHE STRING "Install subdirectory for binary files") +SET(APR_INSTALL_LIB_DIR "lib" CACHE STRING "Install subdirectory for library files") +SET(APR_INSTALL_INCLUDE_DIR "include" CACHE STRING "Install subdirectory for include files") IF(NOT APR_BUILD_SHARED AND NOT APR_BUILD_STATIC) MESSAGE(FATAL_ERROR "Both APR_BUILD_SHARED and APR_BUILD_STATIC have been disabled")