mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-18 13:03:01 +08:00
[libxlsxwriter] upgrade to 0.8.9 (#9410)
Upgrade to the latest version of libxlsxwriter. Closes #9408
This commit is contained in:
parent
70e7c3e12f
commit
c81d7d9c10
@ -1,8 +1,18 @@
|
|||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
index fe566fe..e76ed46 100644
|
index f2eed91..f329996 100644
|
||||||
--- a/CMakeLists.txt
|
--- a/CMakeLists.txt
|
||||||
+++ b/CMakeLists.txt
|
+++ b/CMakeLists.txt
|
||||||
@@ -306,31 +306,11 @@ endif()
|
@@ -224,6 +224,9 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE ${LXW_PRIVATE_COMPILE_DEFINIT
|
||||||
|
if(MSVC AND NOT (MSVC_VERSION LESS 1900))
|
||||||
|
target_compile_options(${PROJECT_NAME} PRIVATE /utf-8)
|
||||||
|
endif()
|
||||||
|
+if (WINDOWSSTORE)
|
||||||
|
+ target_compile_definitions(${PROJECT_NAME} PRIVATE -DIOWIN32_USING_WINRT_API)
|
||||||
|
+endif()
|
||||||
|
target_include_directories(${PROJECT_NAME}
|
||||||
|
PRIVATE ${LXW_PRIVATE_INCLUDE_DIRS}
|
||||||
|
PUBLIC include include/xlsxwriter
|
||||||
|
@@ -319,31 +322,11 @@ endif()
|
||||||
|
|
||||||
include(GNUInstallDirs)
|
include(GNUInstallDirs)
|
||||||
|
|
@ -1,14 +0,0 @@
|
|||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
||||||
index e76ed46..32ffa04 100644
|
|
||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -211,6 +211,9 @@ target_sources(${PROJECT_NAME}
|
|
||||||
)
|
|
||||||
target_link_libraries(${PROJECT_NAME} LINK_PUBLIC ${ZLIB_LIBRARIES} ${MINIZIP_LIBRARIES})
|
|
||||||
target_compile_definitions(${PROJECT_NAME} PRIVATE ${LXW_PRIVATE_COMPILE_DEFINITIONS})
|
|
||||||
+if (WINDOWSSTORE)
|
|
||||||
+ target_compile_definitions(${PROJECT_NAME} PRIVATE -DIOWIN32_USING_WINRT_API)
|
|
||||||
+endif()
|
|
||||||
target_include_directories(${PROJECT_NAME}
|
|
||||||
PRIVATE ${LXW_PRIVATE_INCLUDE_DIRS}
|
|
||||||
PUBLIC include include/xlsxwriter
|
|
@ -1,14 +0,0 @@
|
|||||||
diff --git a/include/xlsxwriter/utility.h b/include/xlsxwriter/utility.h
|
|
||||||
index 5b4b365..5f86335 100644
|
|
||||||
--- a/include/xlsxwriter/utility.h
|
|
||||||
+++ b/include/xlsxwriter/utility.h
|
|
||||||
@@ -17,7 +17,9 @@
|
|
||||||
#define __LXW_UTILITY_H__
|
|
||||||
|
|
||||||
#include <stdint.h>
|
|
||||||
+#ifndef _MSC_VER
|
|
||||||
#include <strings.h>
|
|
||||||
+#endif
|
|
||||||
#include "common.h"
|
|
||||||
#include "xmlwriter.h"
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
Source: libxlsxwriter
|
Source: libxlsxwriter
|
||||||
Version: 0.8.7-1
|
Version: 0.8.9-1
|
||||||
Description: Libxlsxwriter is a C library that can be used to write text, numbers, formulas and hyperlinks to multiple worksheets in an Excel 2007+ XLSX file.
|
Description: Libxlsxwriter is a C library that can be used to write text, numbers, formulas and hyperlinks to multiple worksheets in an Excel 2007+ XLSX file.
|
||||||
Build-Depends: zlib
|
Build-Depends: zlib
|
||||||
|
@ -1,18 +1,14 @@
|
|||||||
include(vcpkg_common_functions)
|
|
||||||
|
|
||||||
vcpkg_from_github(
|
vcpkg_from_github(
|
||||||
OUT_SOURCE_PATH SOURCE_PATH
|
OUT_SOURCE_PATH SOURCE_PATH
|
||||||
REPO jmcnamara/libxlsxwriter
|
REPO jmcnamara/libxlsxwriter
|
||||||
REF RELEASE_0.8.7
|
REF RELEASE_0.8.9
|
||||||
SHA512 20bf09f084808a8db00315848213c550fb809b587ea49ce3b25b310de981c176a44c518452507b6e00ca3f0a8e0056d88a6f575c031d54aa68791575cb9ab285
|
SHA512 0442323b8e55000aa78a689820f8e446b5e925b5077c6ed163ad181b5a8f0e19fe71cc12c4781f47f70f0c702faa27e49655e813f7e90a855ab73dd2bd9f5d66
|
||||||
HEAD_REF master
|
HEAD_REF master
|
||||||
PATCHES
|
PATCHES
|
||||||
0001-fix-build-error.patch
|
0001-fix-cmake-file.patch
|
||||||
0002-fix-uwp-build.patch
|
|
||||||
0003-fix-include-file.patch
|
|
||||||
)
|
)
|
||||||
|
|
||||||
if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
|
if (VCPKG_TARGET_IS_UWP)
|
||||||
set(USE_WINDOWSSTORE ON)
|
set(USE_WINDOWSSTORE ON)
|
||||||
else()
|
else()
|
||||||
set(USE_WINDOWSSTORE OFF)
|
set(USE_WINDOWSSTORE OFF)
|
||||||
@ -30,5 +26,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
|||||||
|
|
||||||
vcpkg_copy_pdbs()
|
vcpkg_copy_pdbs()
|
||||||
|
|
||||||
file(COPY ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/)
|
file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||||
file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/License.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
|
|
||||||
|
Loading…
Reference in New Issue
Block a user