StarMirror/xlnt
1
0
Fork 0
mirror of https://github.com/tfussell/xlnt.git synced 2024-03-22 13:11:17 +08:00
Code Issues Projects Releases Wiki Activity

improve third-party lib handling for vcpkg

Browse Source
This commit is contained in:
Thomas Fussell 2017-02-28 00:00:25 -05:00
parent d7b0e252fd
commit 9cdf31065c
6 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -3,3 +3,6 @@
url = http://scm.codesynthesis.com/libstudxml/libstudxml.git url = http://scm.codesynthesis.com/libstudxml/libstudxml.git
branch = master branch = master
ignore = dirty ignore = dirty
[submodule "third-party/cxxtest"]
path = third-party/cxxtest
url = https://github.com/CxxTest/cxxtest

3
source/detail/xlsx_crypto.hpp
View File

@ -23,6 +23,7 @@
#include <array> #include <array>
#include <xlnt/xlnt_config.hpp>
#include <xlnt/utils/exceptions.hpp> #include <xlnt/utils/exceptions.hpp>
#include <xlnt/workbook/workbook.hpp> #include <xlnt/workbook/workbook.hpp>
#include <detail/constants.hpp> #include <detail/constants.hpp>
@ -50,7 +51,7 @@ enum class hash_algorithm
whirlpool whirlpool
}; };
struct crypto_helper struct XLNT_API crypto_helper
{ {
static const std::size_t segment_length; static const std::size_t segment_length;

4
source/workbook/tests/test_consume_xlsx.hpp
View File

@ -56,8 +56,8 @@ public:
#ifndef __MINGW32__ #ifndef __MINGW32__
xlnt::workbook wb2; xlnt::workbook wb2;
const auto path = U8STRING_LITERAL(XLNT_TEST_DATA_DIR) u8"/9_unicode_filename_Λ.xlsx"; const auto path2 = U8STRING_LITERAL(XLNT_TEST_DATA_DIR) u8"/9_unicode_filename_Λ.xlsx";
wb2.load(path); wb2.load(path2);
TS_ASSERT_EQUALS(wb2.active_sheet().cell("A1").value<std::string>(), "unicode!"); TS_ASSERT_EQUALS(wb2.active_sheet().cell("A1").value<std::string>(), "unicode!");
#endif #endif
} }

7
tests/CMakeLists.txt
View File

@ -8,6 +8,10 @@ if(NOT COMBINED_PROJECT)
add_subdirectory(${LIBRARY_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/source) add_subdirectory(${LIBRARY_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/source)
endif() endif()
set(CXXTEST_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../third-party/cxxtest)
set(CXXTEST_PYTHON_TESTGEN_EXECUTABLE ${CXXTEST_ROOT_DIR}/bin/cxxtestgen)
set(CXXTEST_INCLUDE_DIR ${CXXTEST_ROOT_DIR})
file(GLOB CELL_TESTS ${CMAKE_CURRENT_SOURCE_DIR}/../source/cell/tests/test_*.hpp) file(GLOB CELL_TESTS ${CMAKE_CURRENT_SOURCE_DIR}/../source/cell/tests/test_*.hpp)
file(GLOB CHARTS_TESTS ${CMAKE_CURRENT_SOURCE_DIR}/../source/charts/tests/test_*.hpp) file(GLOB CHARTS_TESTS ${CMAKE_CURRENT_SOURCE_DIR}/../source/charts/tests/test_*.hpp)
file(GLOB CHARTSHEET_TESTS ${CMAKE_CURRENT_SOURCE_DIR}/../source/chartsheet/tests/test_*.hpp) file(GLOB CHARTSHEET_TESTS ${CMAKE_CURRENT_SOURCE_DIR}/../source/chartsheet/tests/test_*.hpp)
@ -73,10 +77,9 @@ else()
endif() endif()
find_package(PythonInterp REQUIRED) find_package(PythonInterp REQUIRED)
find_package(CxxTest REQUIRED)
add_custom_command(OUTPUT ${RUNNER} add_custom_command(OUTPUT ${RUNNER}
COMMAND ${CXXTEST_PYTHON_TESTGEN_EXECUTABLE} --runner=ErrorPrinter -o ${RUNNER} ${TESTS} COMMAND ${PYTHON_EXECUTABLE} ${CXXTEST_PYTHON_TESTGEN_EXECUTABLE} --runner=ErrorPrinter -o ${RUNNER} ${TESTS}
DEPENDS ${TESTS} DEPENDS ${TESTS}
COMMENT "Generating test runner ${RUNNER}") COMMENT "Generating test runner ${RUNNER}")

6
third-party/CMakeLists.txt vendored
View File

@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 3.2)
project(xlnt.third-party) project(xlnt.third-party)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
find_package(ZLIB REQUIRED)
find_package(CryptoPP REQUIRED)
find_package(CxxTest REQUIRED)
set(LIBSTUDXML_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libstudxml) set(LIBSTUDXML_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libstudxml)
set(LIBSTUDXML set(LIBSTUDXML
@ -24,8 +20,6 @@ set(LIBSTUDXML
set(EXPAT set(EXPAT
${LIBSTUDXML_ROOT_DIR}/xml/details/expat/xmlparse.c ${LIBSTUDXML_ROOT_DIR}/xml/details/expat/xmlparse.c
${LIBSTUDXML_ROOT_DIR}/xml/details/expat/xmlrole.c ${LIBSTUDXML_ROOT_DIR}/xml/details/expat/xmlrole.c
# ${LIBSTUDXML_ROOT_DIR}/xml/details/expat/xmltok_impl.c
# ${LIBSTUDXML_ROOT_DIR}/xml/details/expat/xmltok_ns.c
${LIBSTUDXML_ROOT_DIR}/xml/details/expat/xmltok.c ${LIBSTUDXML_ROOT_DIR}/xml/details/expat/xmltok.c
${LIBSTUDXML_ROOT_DIR}/xml/details/expat/ascii.h ${LIBSTUDXML_ROOT_DIR}/xml/details/expat/ascii.h
${LIBSTUDXML_ROOT_DIR}/xml/details/expat/asciitab.h ${LIBSTUDXML_ROOT_DIR}/xml/details/expat/asciitab.h

1
third-party/cxxtest vendored Submodule

@ -0,0 +1 @@
Subproject commit 191adddb3876ab389c0c856e1c03874bf70f8ee4