From b5ddd440ed61e7fcb25ee5c877324e9a5c143dcd Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Sun, 25 Feb 2018 03:11:23 -0800 Subject: [PATCH] [mman] Move header to mman/sys/mman.h to avoid tricking other libraries --- ports/mman/CONTROL | 2 +- ports/mman/portfile.cmake | 4 ++++ ports/mman/usage | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 ports/mman/usage diff --git a/ports/mman/CONTROL b/ports/mman/CONTROL index f0ff4ec69..dad1b19da 100644 --- a/ports/mman/CONTROL +++ b/ports/mman/CONTROL @@ -1,3 +1,3 @@ Source: mman -Version: git-f5ff813-1 +Version: git-f5ff813-2 Description: A light implementation of the mmap functions for MinGW. diff --git a/ports/mman/portfile.cmake b/ports/mman/portfile.cmake index 88c23348e..0330cdd2c 100644 --- a/ports/mman/portfile.cmake +++ b/ports/mman/portfile.cmake @@ -21,6 +21,10 @@ vcpkg_configure_cmake( vcpkg_install_cmake() +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include/mman) +file(RENAME ${CURRENT_PACKAGES_DIR}/include/sys ${CURRENT_PACKAGES_DIR}/include/mman/sys) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/mman) file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/mman RENAME copyright) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/mman/usage b/ports/mman/usage new file mode 100644 index 000000000..25d00d4c0 --- /dev/null +++ b/ports/mman/usage @@ -0,0 +1,4 @@ +The mman.h header deployed by mman is placed in mman/sys/mman.h to avoid accidental inclusion. + + find_path(MMAN_DIR NAMES sys/mman.h PATH_SUFFIXES mman) + target_include_directories(main PRIVATE ${MMAN_DIR})