Skip to content

Commit

Permalink
On '1.7.x' branch: Merge r1918047 from trunk:
Browse files Browse the repository at this point in the history
  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
  • Loading branch information
Ivan Zhakov committed May 29, 2024
1 parent 7b4daa4 commit b419790
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit b419790

Please sign in to comment.