@@ -106,6 +106,7 @@ if(APR_BUILD_STATIC_LIB)
106106 set (STATIC_TARGET_NAME staticLib)
107107 add_library (${STATIC_TARGET_NAME} STATIC $<TARGET_OBJECTS:aprObjLib>)
108108 set_target_properties (${STATIC_TARGET_NAME} PROPERTIES OUTPUT_NAME ${LIBRARY_NAME} )
109+ target_include_directories (${STATIC_TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR} /src> $<BUILD_INTERFACE:${PROJECT_BINARY_DIR} >)
109110
110111 # generate fat static library by adding dependencies
111112 include (cmake/AddStaticLibs.cmake)
@@ -116,6 +117,7 @@ if(APR_BUILD_SHARED_LIB)
116117# generate fat shared library
117118 set (SHARED_TARGET_NAME sharedLib)
118119 add_library (${SHARED_TARGET_NAME} SHARED $<TARGET_OBJECTS:aprObjLib>)
120+ target_include_directories (${SHARED_TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR} /src> $<BUILD_INTERFACE:${PROJECT_BINARY_DIR} >)
119121 set_target_properties (${SHARED_TARGET_NAME} PROPERTIES OUTPUT_NAME ${LIBRARY_NAME} )
120122 set_target_properties (${SHARED_TARGET_NAME} PROPERTIES LIBRARY_OUTPUT_NAME ${LIBRARY_NAME} )
121123 set_target_properties (${SHARED_TARGET_NAME} PROPERTIES ARCHIVE_OUTPUT_NAME ${LIBRARY_NAME} )
@@ -154,7 +156,7 @@ if(APR_INSTALL)
154156 EXPORT ${APR_TARGETS}
155157 LIBRARY DESTINATION ${INSTALL_LIB_DIR}
156158 ARCHIVE DESTINATION ${INSTALL_LIB_DIR}
157- INCLUDES DESTINATION ${INSTALL_INCLUDE_DIR} )
159+ INCLUDES DESTINATION ${INSTALL_INCLUDE_DIR} ${INSTALL_INCLUDE_DIR} / ${LIBRARY_NAME} )
158160
159161 # pkg-config
160162 configure_file ("${CMAKE_CURRENT_SOURCE_DIR} /cmake/apr.pc.in" "${CMAKE_CURRENT_BINARY_DIR} /apr.pc" @ONLY)
0 commit comments