diff options
| author | atkawa7 <atkawa7@yahoo.com> | 2017-07-23 11:46:49 -0700 |
|---|---|---|
| committer | atkawa7 <atkawa7@yahoo.com> | 2017-07-23 11:46:49 -0700 |
| commit | a3f0d84839caa64c500ceda8095b8da42cd4359a (patch) | |
| tree | 70eabd69adc83a3d77d6fd85beb69a07f8a8d025 | |
| parent | 21b2afb9d7c0a8a1d273a380ea179798343bbaa6 (diff) | |
| download | vcpkg-a3f0d84839caa64c500ceda8095b8da42cd4359a.tar.gz vcpkg-a3f0d84839caa64c500ceda8095b8da42cd4359a.zip | |
[minizip] fix linker issues
| -rw-r--r-- | ports/minizip/CMakeLists.txt | 19 | ||||
| -rw-r--r-- | ports/minizip/portfile.cmake | 4 |
2 files changed, 21 insertions, 2 deletions
diff --git a/ports/minizip/CMakeLists.txt b/ports/minizip/CMakeLists.txt index 11d08a3c8..caf2b856d 100644 --- a/ports/minizip/CMakeLists.txt +++ b/ports/minizip/CMakeLists.txt @@ -18,7 +18,7 @@ set(SRC ${MIN_SRC}/iowin32.c ${MIN_SRC}/unzip.c ${MIN_SRC}/zip.c - ${MIN_SRC}/mz.c + ${MIN_SRC}/unzip.c ${MIN_SRC}/mztools.c ) set(HEADERS @@ -26,6 +26,7 @@ set(HEADERS ${MIN_SRC}/iowin32.h ${MIN_SRC}/unzip.h ${MIN_SRC}/zip.h + ${MIN_SRC}/unzip.h ${MIN_SRC}/mztools.h ) if(BUILD_SHARED_LIBS) @@ -40,6 +41,16 @@ target_compile_definitions(minizip PRIVATE -D_ZLIB_H) target_link_libraries(minizip PRIVATE ${BZIP2_LIBRARIES}) target_compile_definitions(minizip PRIVATE -DHAVE_BZIP2=1) +add_executable(minizip_bin ${MIN_SRC}/minizip.c) +add_executable(miniunz_bin ${MIN_SRC}/miniunz.c) + +target_link_libraries(minizip_bin minizip ${BZIP2_LIBRARIES} ZLIB::ZLIB) +target_link_libraries(miniunz_bin minizip ${BZIP2_LIBRARIES} ZLIB::ZLIB) + +set_target_properties(minizip_bin PROPERTIES OUTPUT_NAME minizip) +set_target_properties(miniunz_bin PROPERTIES OUTPUT_NAME miniunz) + + install( TARGETS minizip RUNTIME DESTINATION bin @@ -47,6 +58,12 @@ install( ARCHIVE DESTINATION lib ) +if(NOT DISABLE_INSTALL_TOOLS) + install ( + TARGETS minizip_bin miniunz_bin + RUNTIME DESTINATION tools/minizip + ) +endif() if(NOT DISABLE_INSTALL_HEADERS) install(FILES ${HEADERS} DESTINATION include/minizip) diff --git a/ports/minizip/portfile.cmake b/ports/minizip/portfile.cmake index c1c04f211..c0ed49486 100644 --- a/ports/minizip/portfile.cmake +++ b/ports/minizip/portfile.cmake @@ -17,10 +17,12 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON + OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -DDISABLE_INSTALL_TOOLS=ON ) vcpkg_install_cmake() vcpkg_copy_pdbs() +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/minizip) + file(INSTALL ${SOURCE_PATH}/contrib/minizip/MiniZip64_info.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/minizip RENAME copyright) |