diff --git a/ports/apr/apr-r1917051.patch b/ports/apr/apr-r1917051.patch new file mode 100644 index 00000000000000..ff3da9f475077a --- /dev/null +++ b/ports/apr/apr-r1917051.patch @@ -0,0 +1,89 @@ +Index: CMakeLists.txt +=================================================================== +--- CMakeLists.txt (revision 1917050) ++++ CMakeLists.txt (revision 1917051) +@@ -25,10 +25,20 @@ + OPTION(APR_HAVE_IPV6 "IPv6 support" ON) + OPTION(INSTALL_PDB "Install .pdb files (if generated)" ON) + OPTION(APR_BUILD_TESTAPR "Build the test suite" OFF) ++OPTION(APR_BUILD_SHARED "Build shared libraries" ON) ++OPTION(APR_BUILD_STATIC "Build static libraries." ON) + OPTION(TEST_STATIC_LIBS "Test programs use APR static libraries instead of shared libraries?" OFF) + SET(MIN_WINDOWS_VER "Vista" + CACHE STRING "Minimum Windows version") + ++IF(NOT APR_BUILD_SHARED AND NOT APR_BUILD_STATIC) ++ MESSAGE(FATAL_ERROR "Both APR_BUILD_SHARED and APR_BUILD_STATIC have been disabled") ++ENDIF() ++ ++IF(NOT APR_BUILD_STATIC AND TEST_STATIC_LIBS) ++ MESSAGE(FATAL_ERROR "APR_BUILD_STATIC have been disabled, but TEST_STATIC_LIBS is enabled") ++ENDIF() ++ + # create 1-or-0 representation of feature tests for apr.h + + SET(apr_have_ipv6_10 0) +@@ -267,27 +277,35 @@ + SET(install_bin_pdb) + + # libapr-1 is shared, apr-1 is static +-ADD_LIBRARY(libapr-1 SHARED ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libapr.rc) +-SET(install_targets ${install_targets} libapr-1) +-SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/libapr-1.pdb) +-TARGET_LINK_LIBRARIES(libapr-1 ${APR_SYSTEM_LIBS}) +-SET_TARGET_PROPERTIES(libapr-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_EXPORT;WINNT") +-ADD_DEPENDENCIES(libapr-1 test_char_header) ++IF (APR_BUILD_SHARED) ++ ADD_LIBRARY(libapr-1 SHARED ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libapr.rc) ++ SET(install_targets ${install_targets} libapr-1) ++ SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/libapr-1.pdb) ++ TARGET_LINK_LIBRARIES(libapr-1 ${APR_SYSTEM_LIBS}) ++ SET_TARGET_PROPERTIES(libapr-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_EXPORT;WINNT") ++ ADD_DEPENDENCIES(libapr-1 test_char_header) ++ENDIF() + +-ADD_LIBRARY(apr-1 STATIC ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED}) +-SET(install_targets ${install_targets} apr-1) +-TARGET_LINK_LIBRARIES(apr-1 ${APR_SYSTEM_LIBS}) +-SET_TARGET_PROPERTIES(apr-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;WINNT") +-ADD_DEPENDENCIES(apr-1 test_char_header) ++IF (APR_BUILD_STATIC) ++ ADD_LIBRARY(apr-1 STATIC ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED}) ++ SET(install_targets ${install_targets} apr-1) ++ TARGET_LINK_LIBRARIES(apr-1 ${APR_SYSTEM_LIBS}) ++ SET_TARGET_PROPERTIES(apr-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;WINNT") ++ ADD_DEPENDENCIES(apr-1 test_char_header) ++ENDIF() + + # libaprapp-1 and aprapp-1 are static +-ADD_LIBRARY(libaprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED}) +-SET(install_targets ${install_targets} libaprapp-1) +-SET_TARGET_PROPERTIES(libaprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_APP;WINNT") ++IF (APR_BUILD_SHARED) ++ ADD_LIBRARY(libaprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED}) ++ SET(install_targets ${install_targets} libaprapp-1) ++ SET_TARGET_PROPERTIES(libaprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_APP;WINNT") ++ENDIF() + +-ADD_LIBRARY(aprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED}) +-SET(install_targets ${install_targets} aprapp-1) +-SET_TARGET_PROPERTIES(aprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;APR_APP;WINNT") ++IF (APR_BUILD_STATIC) ++ ADD_LIBRARY(aprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED}) ++ SET(install_targets ${install_targets} aprapp-1) ++ SET_TARGET_PROPERTIES(aprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;APR_APP;WINNT") ++ENDIF() + + IF(APR_BUILD_TESTAPR) + ENABLE_TESTING() +@@ -443,7 +461,8 @@ + MESSAGE(STATUS " Install prefix .................. : ${CMAKE_INSTALL_PREFIX}") + MESSAGE(STATUS " C compiler ...................... : ${CMAKE_C_COMPILER}") + MESSAGE(STATUS " IPv6 ............................ : ${APR_HAVE_IPV6}") +-MESSAGE(STATUS " Minimum Windows version ......... : ${MIN_WINDOWS_VER}") ++MESSAGE(STATUS " Build shared libs ............... : ${APR_BUILD_SHARED}") ++MESSAGE(STATUS " Build static libs ............... : ${APR_BUILD_STATIC}") + MESSAGE(STATUS " Build test suite ................ : ${APR_BUILD_TESTAPR}") + IF(TEST_STATIC_LIBS) + MESSAGE(STATUS " (testing static libraries)") + diff --git a/ports/apr/apr-r1917065.patch b/ports/apr/apr-r1917065.patch new file mode 100644 index 00000000000000..db96b960ffd0f0 --- /dev/null +++ b/ports/apr/apr-r1917065.patch @@ -0,0 +1,13 @@ +Index: CMakeLists.txt +=================================================================== +--- CMakeLists.txt (revision 1917064) ++++ CMakeLists.txt (revision 1917065) +@@ -461,6 +461,7 @@ + MESSAGE(STATUS " Install prefix .................. : ${CMAKE_INSTALL_PREFIX}") + MESSAGE(STATUS " C compiler ...................... : ${CMAKE_C_COMPILER}") + MESSAGE(STATUS " IPv6 ............................ : ${APR_HAVE_IPV6}") ++MESSAGE(STATUS " Minimum Windows version ......... : ${MIN_WINDOWS_VER}") + MESSAGE(STATUS " Build shared libs ............... : ${APR_BUILD_SHARED}") + MESSAGE(STATUS " Build static libs ............... : ${APR_BUILD_STATIC}") + MESSAGE(STATUS " Build test suite ................ : ${APR_BUILD_TESTAPR}") + diff --git a/ports/apr/apr-r1917283.patch b/ports/apr/apr-r1917283.patch new file mode 100644 index 00000000000000..787414b7312482 --- /dev/null +++ b/ports/apr/apr-r1917283.patch @@ -0,0 +1,218 @@ +Index: CMakeLists.txt +=================================================================== +--- CMakeLists.txt (revision 1917282) ++++ CMakeLists.txt (revision 1917283) +@@ -21,6 +21,23 @@ + + PROJECT(APR C) + ++# Enable support for MSVC runtime library selection by abstraction ++# if supported by CMake. ++IF(POLICY CMP0091) ++ CMAKE_POLICY(SET CMP0091 NEW) ++ENDIF() ++ ++# Add simple support CMAKE_WARNING_AS_ERROR if CMake doesn't ++# support it. ++IF (CMAKE_VERSION VERSION_LESS 3.24) ++ IF(CMAKE_WARNING_AS_ERROR AND MSVC) ++ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX") ++ ENDIF() ++ENDIF() ++ ++SET(apr_name apr-1) ++SET(apr_libname libapr-1) ++ + OPTION(APR_INSTALL_PRIVATE_H "Install selected private .h files (for httpd)" OFF) + OPTION(APR_HAVE_IPV6 "IPv6 support" ON) + OPTION(INSTALL_PDB "Install .pdb files (if generated)" ON) +@@ -81,11 +98,11 @@ + # you've generated apr.h before using a different build + + SET(APR_INCLUDE_DIRECTORIES +- ${PROJECT_BINARY_DIR} +- ${CMAKE_CURRENT_SOURCE_DIR}/include +- ${CMAKE_CURRENT_SOURCE_DIR}/include/arch/win32 +- ${CMAKE_CURRENT_SOURCE_DIR}/include/arch/unix +- ${CMAKE_CURRENT_SOURCE_DIR}/include/private ++ $ ++ $ ++ $ ++ $ ++ $ + ) + + SET(APR_SYSTEM_LIBS +@@ -278,33 +295,53 @@ + + # libapr-1 is shared, apr-1 is static + IF (APR_BUILD_SHARED) +- ADD_LIBRARY(libapr-1 SHARED ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libapr.rc) +- SET(install_targets ${install_targets} libapr-1) +- SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/libapr-1.pdb) +- TARGET_LINK_LIBRARIES(libapr-1 ${APR_SYSTEM_LIBS}) +- SET_TARGET_PROPERTIES(libapr-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_EXPORT;WINNT") +- ADD_DEPENDENCIES(libapr-1 test_char_header) ++ ADD_LIBRARY(${apr_libname} SHARED ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libapr.rc) ++ LIST(APPEND install_targets ${apr_libname}) ++ LIST(APPEND install_bin_pdb ${PROJECT_BINARY_DIR}/${apr_libname}.pdb) ++ TARGET_LINK_LIBRARIES(${apr_libname} ++ PRIVATE ${APR_SYSTEM_LIBS}) ++ TARGET_COMPILE_DEFINITIONS(${apr_libname} ++ PRIVATE "APR_DECLARE_EXPORT;WINNT" ++ INTERFACE "APR_DECLARE_IMPORT;WINNT") ++ TARGET_INCLUDE_DIRECTORIES(${apr_libname} ++ PRIVATE ${APR_INCLUDE_DIRECTORIES} ++ INTERFACE $ ${APR_INCLUDE_DIRECTORIES} ++ ) ++ ADD_DEPENDENCIES(${apr_libname} test_char_header) + ENDIF() + + IF (APR_BUILD_STATIC) +- ADD_LIBRARY(apr-1 STATIC ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED}) +- SET(install_targets ${install_targets} apr-1) +- TARGET_LINK_LIBRARIES(apr-1 ${APR_SYSTEM_LIBS}) +- SET_TARGET_PROPERTIES(apr-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;WINNT") +- ADD_DEPENDENCIES(apr-1 test_char_header) ++ ADD_LIBRARY(${apr_name} STATIC ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED}) ++ LIST(APPEND install_targets ${apr_name}) ++ TARGET_LINK_LIBRARIES(${apr_name} ++ PRIVATE ${APR_SYSTEM_LIBS}) ++ TARGET_COMPILE_DEFINITIONS(${apr_name} ++ PRIVATE "APR_DECLARE_STATIC;WINNT" ++ INTERFACE "APR_DECLARE_STATIC;WINNT") ++ TARGET_INCLUDE_DIRECTORIES(${apr_name} ++ PRIVATE ${APR_INCLUDE_DIRECTORIES} ++ INTERFACE $ ${APR_INCLUDE_DIRECTORIES} ++ ) ++ ADD_DEPENDENCIES(${apr_name} test_char_header) + ENDIF() + + # libaprapp-1 and aprapp-1 are static + IF (APR_BUILD_SHARED) + ADD_LIBRARY(libaprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED}) +- SET(install_targets ${install_targets} libaprapp-1) ++ LIST(APPEND install_targets libaprapp-1) + SET_TARGET_PROPERTIES(libaprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_APP;WINNT") ++ TARGET_INCLUDE_DIRECTORIES(libaprapp-1 ++ PRIVATE ${APR_INCLUDE_DIRECTORIES} ++ ) + ENDIF() + + IF (APR_BUILD_STATIC) + ADD_LIBRARY(aprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED}) +- SET(install_targets ${install_targets} aprapp-1) ++ LIST(APPEND install_targets aprapp-1) + SET_TARGET_PROPERTIES(aprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;APR_APP;WINNT") ++ TARGET_INCLUDE_DIRECTORIES(aprapp-1 ++ PRIVATE ${APR_INCLUDE_DIRECTORIES} ++ ) + ENDIF() + + IF(APR_BUILD_TESTAPR) +@@ -323,21 +360,16 @@ + ${PROJECT_BINARY_DIR}/data/mmap_datafile.txt) + + IF(TEST_STATIC_LIBS) +- SET(whichapr apr-1) ++ SET(whichapr ${apr_name}) + SET(whichaprapp aprapp-1) +- SET(apiflag -DAPR_DECLARE_STATIC) + ELSE() +- SET(whichapr libapr-1) ++ SET(whichapr ${apr_libname}) + SET(whichaprapp libaprapp-1) +- SET(apiflag) + ENDIF() + + ADD_EXECUTABLE(testapp test/testapp.c) +- TARGET_LINK_LIBRARIES(testapp ${whichapr} ${whichaprapp} ${APR_SYSTEM_LIBS}) ++ TARGET_LINK_LIBRARIES(testapp ${whichapr} ${whichaprapp}) + SET_TARGET_PROPERTIES(testapp PROPERTIES LINK_FLAGS /entry:wmainCRTStartup) +- IF(apiflag) +- SET_TARGET_PROPERTIES(testapp PROPERTIES COMPILE_FLAGS ${apiflag}) +- ENDIF() + ADD_TEST(NAME testapp COMMAND testapp) + + SET (APR_TEST_SOURCES +@@ -350,11 +382,8 @@ + ENDFOREACH() + + ADD_EXECUTABLE(testall ${APR_TEST_SOURCES}) +- TARGET_LINK_LIBRARIES(testall ${whichapr} ${APR_SYSTEM_LIBS}) ++ TARGET_LINK_LIBRARIES(testall ${whichapr} ws2_32.lib) + SET_TARGET_PROPERTIES(testall PROPERTIES COMPILE_DEFINITIONS "BINPATH=$") +- IF(apiflag) +- SET_TARGET_PROPERTIES(testall PROPERTIES COMPILE_FLAGS ${apiflag}) +- ENDIF() + + FOREACH(test ${APR_TEST_SUITES}) + ADD_TEST(NAME ${test} COMMAND testall -v ${test}) +@@ -361,7 +390,7 @@ + ENDFOREACH() + + ADD_LIBRARY(mod_test MODULE test/mod_test.c) +- TARGET_LINK_LIBRARIES(mod_test ${whichapr} ${APR_SYSTEM_LIBS}) ++ TARGET_LINK_LIBRARIES(mod_test ${whichapr}) + SET_PROPERTY(TARGET mod_test APPEND PROPERTY LINK_FLAGS /export:print_hello) + # nasty work-around for difficulties adding more than one additional flag + # (they get joined in a bad way behind the scenes) +@@ -368,9 +397,6 @@ + GET_PROPERTY(link_flags TARGET mod_test PROPERTY LINK_FLAGS) + SET(link_flags "${link_flags} /export:count_reps") + SET_TARGET_PROPERTIES(mod_test PROPERTIES LINK_FLAGS ${link_flags}) +- IF(apiflag) +- SET_TARGET_PROPERTIES(mod_test PROPERTIES COMPILE_FLAGS ${apiflag}) +- ENDIF() + + # Build all the single-source executable files with no special build + # requirements. +@@ -394,11 +420,10 @@ + FOREACH(sourcefile ${single_source_programs}) + STRING(REGEX REPLACE ".*/([^\\]+)\\.c" "\\1" proggie ${sourcefile}) + ADD_EXECUTABLE(${proggie} ${sourcefile}) +- TARGET_LINK_LIBRARIES(${proggie} ${whichapr} ${APR_SYSTEM_LIBS}) ++ TARGET_LINK_LIBRARIES(${proggie} ${whichapr}) + SET_TARGET_PROPERTIES(${proggie} PROPERTIES COMPILE_DEFINITIONS "BINPATH=$") +- IF(apiflag) +- SET_TARGET_PROPERTIES(${proggie} PROPERTIES COMPILE_FLAGS ${apiflag}) +- ENDIF() ++ ++ ADD_DEPENDENCIES(testall ${proggie}) + ENDFOREACH() + + # Add tests for programs that run by themselves with no arguments. +@@ -424,13 +449,20 @@ + ENDIF (APR_BUILD_TESTAPR) + + # Installation ++string(TOLOWER "${PROJECT_NAME}" project_name_lower) + +-INSTALL(TARGETS ${install_targets} ++INSTALL(TARGETS ${install_targets} EXPORT apr-config + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + ) + ++INSTALL(EXPORT apr-config ++ NAMESPACE apr:: ++ DESTINATION "lib/cmake/${project_name_lower}" ++ FILE "${project_name_lower}-config.cmake" ++) ++ + IF(INSTALL_PDB) + INSTALL(FILES ${install_bin_pdb} + DESTINATION bin +Index: . +=================================================================== +--- . (revision 1917282) ++++ . (revision 1917283) + +Property changes on: . +___________________________________________________________________ +Modified: svn:mergeinfo +## -0,0 +0,2 ## + Merged /apr/apr/branches/1.7.x-cmake-improvements:r1917214-1917282 + Merged /apr/apr/trunk:r1895471,1895519-1895520,1902517,1905416,1917107,1917109,1917112,1917114-1917115,1917162,1917250 + diff --git a/ports/apr/apr-r1917612.patch b/ports/apr/apr-r1917612.patch new file mode 100644 index 00000000000000..fbce1dd2f15781 --- /dev/null +++ b/ports/apr/apr-r1917612.patch @@ -0,0 +1,56 @@ +Index: CMakeLists.txt +=================================================================== +--- CMakeLists.txt (revision 1917611) ++++ CMakeLists.txt (revision 1917612) +@@ -74,6 +74,13 @@ + SET(win32_winnt_str ${MIN_WINDOWS_VER}) + ENDIF() + ++# Read current version. ++FILE(STRINGS include/apr_version.h VERSION_STRINGS REGEX "#define (APR_MAJOR_VERSION|APR_MINOR_VERSION|APR_PATCH_VERSION)") ++ ++STRING(REGEX REPLACE ".*#define APR_MAJOR_VERSION[ \t]+([0-9]+).*" "\\1" APR_MAJOR_VERSION ${VERSION_STRINGS}) ++STRING(REGEX REPLACE ".*#define APR_MINOR_VERSION[ \t]+([0-9]+).*" "\\1" APR_MINOR_VERSION ${VERSION_STRINGS}) ++STRING(REGEX REPLACE ".*#define APR_PATCH_VERSION[ \t]+([0-9]+).*" "\\1" APR_PATCH_VERSION ${VERSION_STRINGS}) ++ + CONFIGURE_FILE(include/apr.hwc + ${PROJECT_BINARY_DIR}/apr.h) + +@@ -449,8 +456,15 @@ + ENDIF (APR_BUILD_TESTAPR) + + # Installation ++INCLUDE(CMakePackageConfigHelpers) ++ + string(TOLOWER "${PROJECT_NAME}" project_name_lower) + ++write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/${project_name_lower}-config-version.cmake" ++ VERSION ${APR_MAJOR_VERSION}.${APR_MINOR_VERSION}.${APR_PATCH_VERSION} ++ COMPATIBILITY SameMajorVersion ++) ++ + INSTALL(TARGETS ${install_targets} EXPORT apr-config + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib +@@ -463,6 +477,10 @@ + FILE "${project_name_lower}-config.cmake" + ) + ++INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/${project_name_lower}-config-version.cmake" ++ DESTINATION "lib/cmake/${project_name_lower}" ++) ++ + IF(INSTALL_PDB) + INSTALL(FILES ${install_bin_pdb} + DESTINATION bin +Index: . +=================================================================== +--- . (revision 1917611) ++++ . (revision 1917612) + +Property changes on: . +___________________________________________________________________ +Modified: svn:mergeinfo +## -0,0 +0,1 ## + Merged /apr/apr/trunk:r1917604 + diff --git a/ports/apr/fix-configcmake.patch b/ports/apr/fix-configcmake.patch deleted file mode 100644 index 8104810d05f75e..00000000000000 --- a/ports/apr/fix-configcmake.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b4632c3..0b86d12 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -259,27 +259,35 @@ SET(install_targets) - SET(install_bin_pdb) - - # libapr-1 is shared, apr-1 is static -+IF(BUILD_SHARED_LIBS) - ADD_LIBRARY(libapr-1 SHARED ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libapr.rc) - SET(install_targets ${install_targets} libapr-1) - SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/libapr-1.pdb) - TARGET_LINK_LIBRARIES(libapr-1 ${APR_SYSTEM_LIBS}) - SET_TARGET_PROPERTIES(libapr-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_EXPORT;WINNT") - ADD_DEPENDENCIES(libapr-1 test_char_header) -- -+TARGET_INCLUDE_DIRECTORIES(libapr-1 INTERFACE $) -+ELSE() - ADD_LIBRARY(apr-1 STATIC ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED}) - SET(install_targets ${install_targets} apr-1) - TARGET_LINK_LIBRARIES(apr-1 ${APR_SYSTEM_LIBS}) - SET_TARGET_PROPERTIES(apr-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;WINNT") - ADD_DEPENDENCIES(apr-1 test_char_header) -+TARGET_INCLUDE_DIRECTORIES(apr-1 INTERFACE $) -+ENDIF() - - # libaprapp-1 and aprapp-1 are static -+IF(BUILD_SHARED_LIBS) - ADD_LIBRARY(libaprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED}) - SET(install_targets ${install_targets} libaprapp-1) - SET_TARGET_PROPERTIES(libaprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_APP;WINNT") -- -+TARGET_INCLUDE_DIRECTORIES(libaprapp-1 INTERFACE $) -+ELSE() - ADD_LIBRARY(aprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED}) - SET(install_targets ${install_targets} aprapp-1) - SET_TARGET_PROPERTIES(aprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;APR_APP;WINNT") -+TARGET_INCLUDE_DIRECTORIES(aprapp-1 INTERFACE $) -+ENDIF() - - IF(APR_BUILD_TESTAPR) - ENABLE_TESTING() -@@ -385,12 +393,18 @@ ENDIF (APR_BUILD_TESTAPR) - - # Installation - --INSTALL(TARGETS ${install_targets} -+INSTALL(TARGETS ${install_targets} EXPORT unofficial-apr-config - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib - ) - -+INSTALL(EXPORT unofficial-apr-config -+ NAMESPACE unofficial::apr:: -+ DESTINATION share/unofficial-apr -+ FILE unofficial-apr-config.cmake -+) -+ - IF(INSTALL_PDB) - INSTALL(FILES ${install_bin_pdb} - DESTINATION bin diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake index 84b04326b5df8f..44a01ff5527193 100644 --- a/ports/apr/portfile.cmake +++ b/ports/apr/portfile.cmake @@ -10,7 +10,10 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive(SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES - fix-configcmake.patch + apr-r1917051.patch + apr-r1917065.patch + apr-r1917283.patch + apr-r1917612.patch unglue.patch ) @@ -20,9 +23,15 @@ if (VCPKG_TARGET_IS_WINDOWS) private-headers APR_INSTALL_PRIVATE_H ) + string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" APR_BUILD_STATIC) + string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" APR_BUILD_SHARED) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + -DAPR_BUILD_STATIC=${APR_BUILD_STATIC} + -DAPR_BUILD_SHARED=${APR_BUILD_SHARED} + -DAPR_BUILD_TESTAPR=OFF -DINSTALL_PDB=OFF -DMIN_WINDOWS_VER=Windows7 -DAPR_HAVE_IPV6=ON @@ -30,11 +39,11 @@ if (VCPKG_TARGET_IS_WINDOWS) ) vcpkg_cmake_install() - vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-apr CONFIG_PATH share/unofficial-apr) - # There is no way to suppress installation of the headers in debug builds. - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - vcpkg_copy_pdbs() + vcpkg_cmake_config_fixup(PACKAGE_NAME "apr" + CONFIG_PATH "lib/cmake/apr") + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") else() # To cross-compile you will need a triplet file that locates the tool chain and sets --host and --cache parameters of "./configure". # The ${VCPKG_PLATFORM_TOOLSET}.cache file must have been generated on the targeted host using "./configure -C". @@ -92,5 +101,7 @@ else() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/apr/vcpkg.json b/ports/apr/vcpkg.json index dafc8d0fa3c649..61822a23a8098d 100644 --- a/ports/apr/vcpkg.json +++ b/ports/apr/vcpkg.json @@ -1,6 +1,7 @@ { "name": "apr", "version": "1.7.4", + "port-version": 1, "description": "The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.", "homepage": "https://apr.apache.org/", "license": "Apache-2.0", diff --git a/versions/a-/apr.json b/versions/a-/apr.json index f2acd7ee81996e..f37b68650e3b74 100644 --- a/versions/a-/apr.json +++ b/versions/a-/apr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f1c1420b7adeb7ffa29ea98f687ae3d8cf1a2491", + "version": "1.7.4", + "port-version": 1 + }, { "git-tree": "106ba582ba3d56fd1db284670ed7d94b6cae9f47", "version": "1.7.4", diff --git a/versions/baseline.json b/versions/baseline.json index 5fa2c500897f5f..d6104d9228b807 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -166,7 +166,7 @@ }, "apr": { "baseline": "1.7.4", - "port-version": 0 + "port-version": 1 }, "apr-util": { "baseline": "1.6.3",