summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormturk <mturk@13f79535-47bb-0310-9956-ffa450edef68>2021-12-03 05:19:47 +0000
committermturk <mturk@13f79535-47bb-0310-9956-ffa450edef68>2021-12-03 05:19:47 +0000
commit5893d38153a1e797b20e5a576a26f3b6bb24a92c (patch)
tree5bdcde8aae8e68cd396a73634d8d97e48d0647e4
parent17c9c8fa2a44c5685f7e66ff0948e90ce8ea0b7c (diff)
downloadlibapr-5893d38153a1e797b20e5a576a26f3b6bb24a92c.tar.gz
Use the correct location for installing apr-2 headers (same layout as on nixes)
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1895528 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--CMakeLists.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 125a7231a..9e05e3601 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@
PROJECT(APR C)
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
OPTION(APR_MINIMAL_BUILD "Create minimal APR build" OFF)
IF(NOT APR_MINIMAL_BUILD)
@@ -664,7 +664,7 @@ IF(INSTALL_PDB)
CONFIGURATIONS RelWithDebInfo Debug)
ENDIF()
-INSTALL(FILES ${APR_PUBLIC_HEADERS_STATIC} ${APR_PUBLIC_HEADERS_GENERATED} DESTINATION include)
+INSTALL(FILES ${APR_PUBLIC_HEADERS_STATIC} ${APR_PUBLIC_HEADERS_GENERATED} DESTINATION include/apr-2)
IF(APR_INSTALL_PRIVATE_H)
# Kludges for unexpected dependencies of httpd 2.x, not installed by default
SET(APR_PRIVATE_H_FOR_HTTPD
@@ -673,7 +673,7 @@ IF(APR_INSTALL_PRIVATE_H)
include/arch/win32/apr_arch_utf8.h
include/arch/win32/apr_private.h
)
- INSTALL(FILES ${APR_PRIVATE_H_FOR_HTTPD} DESTINATION include/arch/win32)
+ INSTALL(FILES ${APR_PRIVATE_H_FOR_HTTPD} DESTINATION include/apr-2/arch/win32)
ENDIF()
STRING(TOUPPER "${CMAKE_BUILD_TYPE}" buildtype)