From d69fdffdd14de9c285273d3582698c634251defd Mon Sep 17 00:00:00 2001 From: darkf Date: Wed, 13 Sep 2017 12:08:17 -0500 Subject: [PATCH] Remove mman-win32 dependency --- .gitmodules | 3 --- cmake/external/CMakeLists.txt | 4 ---- cmake/external/mman-win32.cmake | 18 ------------------ external/mman-win32 | 1 - rwengine/CMakeLists.txt | 3 +-- 5 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 cmake/external/mman-win32.cmake delete mode 160000 external/mman-win32 diff --git a/.gitmodules b/.gitmodules index b59fb2a9..e69de29b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "external/mman-win32"] - path = external/mman-win32 - url = https://github.com/witwall/mman-win32.git diff --git a/cmake/external/CMakeLists.txt b/cmake/external/CMakeLists.txt index 27e4e5d0..b0976470 100644 --- a/cmake/external/CMakeLists.txt +++ b/cmake/external/CMakeLists.txt @@ -1,7 +1,3 @@ ##### External files set(EXTERNAL_PREFIX "${CMAKE_BINARY_DIR}/external") - -if(MINGW) - include(mman-win32.cmake) -endif() diff --git a/cmake/external/mman-win32.cmake b/cmake/external/mman-win32.cmake deleted file mode 100644 index 44f70e4f..00000000 --- a/cmake/external/mman-win32.cmake +++ /dev/null @@ -1,18 +0,0 @@ -###### External Project: mman-win32 -include(ExternalProject) - -SET(MMAN_WIN32_PREFIX_DIR ${PROJECT_SOURCE_DIR}/external/mman-win32) - -SET(MMAN_WIN32_SOURCES - ${MMAN_WIN32_PREFIX_DIR}/mman.c) -add_library(mman - ${MMAN_WIN32_SOURCES}) - -# The source folder for mman has mman.h, however, we require sys/mman.h -# To get this, we copy it to the build directory.. This gives us a virtual sys/ folder. -add_custom_command( - TARGET mman - COMMAND ${CMAKE_COMMAND} -E copy "${MMAN_WIN32_PREFIX_DIR}/mman.h" "${CMAKE_CURRENT_BINARY_DIR}/include/sys/mman.h" -) - -target_include_directories(mman INTERFACE SYSTEM ${CMAKE_CURRENT_BINARY_DIR}/include) diff --git a/external/mman-win32 b/external/mman-win32 deleted file mode 160000 index 8c7114f1..00000000 --- a/external/mman-win32 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8c7114f138d59aef428a271b00860c554c69920d diff --git a/rwengine/CMakeLists.txt b/rwengine/CMakeLists.txt index 7b154cf5..83a3416a 100644 --- a/rwengine/CMakeLists.txt +++ b/rwengine/CMakeLists.txt @@ -135,8 +135,7 @@ add_library(rwengine ) if(MINGW) - target_link_libraries(rwengine - mman) + target_link_libraries(rwengine) endif() target_link_libraries(rwengine