fix.diff 2.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990
  1. diff --git a/CMakeLists.txt b/CMakeLists.txt
  2. index 41ce88d..62d0850 100644
  3. --- a/CMakeLists.txt
  4. +++ b/CMakeLists.txt
  5. @@ -95,7 +95,7 @@ endif()
  6. target_include_directories(npy
  7. PUBLIC
  8. - $<INSTALL_INTERFACE:build/native/include>
  9. + $<INSTALL_INTERFACE:include>
  10. $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
  11. PRIVATE
  12. ${CMAKE_CURRENT_SOURCE_DIR}/src
  13. @@ -124,11 +124,12 @@ set(INSTALL_CONFIGDIR "cmake")
  14. install(TARGETS npy
  15. EXPORT npy-targets
  16. - ARCHIVE DESTINATION "build/native/lib"
  17. - LIBRARY DESTINATION "build/native/lib"
  18. + ARCHIVE DESTINATION "lib"
  19. + LIBRARY DESTINATION "lib"
  20. + RUNTIME DESTINATION "bin"
  21. )
  22. -install(DIRECTORY include/ DESTINATION "build/native/include")
  23. +install(DIRECTORY include/ DESTINATION "include")
  24. install(EXPORT npy-targets
  25. FILE
  26. @@ -166,23 +167,19 @@ export(PACKAGE npy)
  27. # -------------------- Package ------------------------------------
  28. -set( PROJECT_FILES
  29. - README.md
  30. - CHANGELOG.md
  31. -)
  32. # copy these files into the root of the distribution zip
  33. -install( FILES ${PROJECT_FILES} DESTINATION "." )
  34. -if( MSVC )
  35. +if( 0 )
  36. # NuGet files
  37. set( LIBNPY_NUGET_NAME "npy-${SYSTEM_TOOLKIT}-${SYSTEM_BITS}-${CMAKE_BUILD_TYPE}" CACHE STRING "npy NuGet Name" FORCE )
  38. file( READ RELEASE_NOTES LIBNPY_RELEASE_NOTES )
  39. configure_file("${CMAKE_CURRENT_SOURCE_DIR}/nuget/template.nuspec.in" "${CMAKE_CURRENT_BINARY_DIR}/nuget/${LIBNPY_NUGET_NAME}.nuspec" @ONLY )
  40. configure_file("${CMAKE_CURRENT_SOURCE_DIR}/nuget/template.targets.in"
  41. - "${CMAKE_CURRENT_BINARY_DIR}/nuget/build/native/${LIBNPY_NUGET_NAME}.targets" @ONLY )
  42. -else()
  43. + "${CMAKE_CURRENT_BINARY_DIR}/nuget/${LIBNPY_NUGET_NAME}.targets" @ONLY )
  44. +endif()
  45. +if( 0 )
  46. set( CPACK_SYSTEM_NAME ${SYSTEM_NAME} )
  47. set( CPACK_PACKAGE_VERSION "${LIBNPY_VERSION}" )
  48. set( CPACK_GENERATOR "ZIP" )
  49. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
  50. index 66f8af4..6423546 100644
  51. --- a/src/CMakeLists.txt
  52. +++ b/src/CMakeLists.txt
  53. @@ -4,12 +4,13 @@ set( SOURCES
  54. npz.cpp
  55. tensor.cpp
  56. zip.cpp
  57. - miniz/miniz.cpp
  58. )
  59. add_definitions( -DLIBNPY_VERSION=${LIBNPY_VERSION} )
  60. -add_library( npy STATIC ${SOURCES} )
  61. +add_library( npy ${SOURCES} )
  62. +find_package( miniz REQUIRED )
  63. +target_link_libraries( npy PRIVATE miniz::miniz )
  64. add_library( npy::npy ALIAS npy )
  65. if (LIBNPY_SANITIZE)
  66. diff --git a/src/zip.cpp b/src/zip.cpp
  67. index 1269704..0c35083 100644
  68. --- a/src/zip.cpp
  69. +++ b/src/zip.cpp
  70. @@ -4,6 +4,8 @@
  71. #include "npy/core.h"
  72. #include "zip.h"
  73. +#include <vector>
  74. +#include <sstream>
  75. namespace {
  76. const size_t CHUNK = 1024 * 1024;