diff options
| author | JackBoosY <47264268+JackBoosY@users.noreply.github.com> | 2019-05-18 04:08:11 +0800 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2019-05-17 13:08:11 -0700 |
| commit | 41c7755acf27f0d8de39fc23f51ddf076f797218 (patch) | |
| tree | c0540bd600656f36a40e19538d8943412d1d1823 | |
| parent | 4f815ca52070485d6f9eb9d2309f94b26a7baf9a (diff) | |
| download | vcpkg-41c7755acf27f0d8de39fc23f51ddf076f797218.tar.gz vcpkg-41c7755acf27f0d8de39fc23f51ddf076f797218.zip | |
[zziplib]Fix build error in linux. (#6471)
* [zziplib]Fix build error in linux.
* [zziplib]Use configure_file to generate config.h
| -rw-r--r-- | ports/zziplib/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ports/zziplib/CONTROL | 4 | ||||
| -rw-r--r-- | ports/zziplib/portfile.cmake | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/ports/zziplib/CMakeLists.txt b/ports/zziplib/CMakeLists.txt index 1cb198e69..634bc5edb 100644 --- a/ports/zziplib/CMakeLists.txt +++ b/ports/zziplib/CMakeLists.txt @@ -29,12 +29,14 @@ if(UNIX) endforeach() endif() +configure_file("${CMAKE_CURRENT_LIST_DIR}/config.h.in" "${CMAKE_CURRENT_LIST_DIR}/zzip/config.h") # List the header files set(HEADERS zzip/__debug.h zzip/__dirent.h zzip/__fnmatch.h zzip/__hints.h zzip/__mmap.h + zzip/config.h zzip/_msvc.h zzip/autoconf.h zzip/conf.h diff --git a/ports/zziplib/CONTROL b/ports/zziplib/CONTROL index 4db036083..362fdee03 100644 --- a/ports/zziplib/CONTROL +++ b/ports/zziplib/CONTROL @@ -1,4 +1,4 @@ Source: zziplib -Version: 0.13.69-2 +Version: 0.13.69-3 Build-Depends: zlib -Description: library providing read access on ZIP-archives +Description: library providing read access on ZIP-archives
\ No newline at end of file diff --git a/ports/zziplib/portfile.cmake b/ports/zziplib/portfile.cmake index 9e0306528..534744714 100644 --- a/ports/zziplib/portfile.cmake +++ b/ports/zziplib/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_from_github( if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") message(STATUS "Configuring zziplib") vcpkg_execute_required_process( - COMMAND "./configure" + COMMAND "./configure" --prefix=${CURRENT_INSTALLED_DIR} --with-zlib WORKING_DIRECTORY "${SOURCE_PATH}" LOGNAME "autotools-config-${TARGET_TRIPLET}" ) @@ -22,6 +22,7 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS -DZLIB_INCLUDE_DIRS=${CURRENT_INSTALLED_DIR}/include ) vcpkg_install_cmake() |