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

Merge branch 'master' of github.com:tfussell/xlnt

Browse Source
This commit is contained in:
Thomas Fussell 2017-03-18 21:31:05 -04:00
commit d7ee03d620
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/CMakeLists.txt
View File

@ -85,7 +85,7 @@ endif()
find_package(PythonInterp REQUIRED)
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}
COMMENT "Generating test runner ${RUNNER}")

2
third-party/libstudxml/CMakeLists.txt vendored
View File

@ -39,4 +39,6 @@ target_link_libraries(libstudxml
if(NOT STATIC)
set_target_properties(libstudxml PROPERTIES POSITION_INDEPENDENT_CODE 1)
else()
target_compile_definitions(libstudxml PUBLIC XML_STATIC=1)
endif()

6
third-party/libstudxml/xml/details/config.h vendored
View File

@ -8,9 +8,7 @@
#ifndef XML_DETAILS_CONFIG_H
#define XML_DETAILS_CONFIG_H
#undef LIBSTUDXML_STATIC_LIB
#define LIBSTUDXML_STATIC_LIB
#undef LIBSTUDXML_EXTERNAL_EXPAT
#undef LIBSTUDXML_BYTEORDER
#define LIBSTUDXML_STATIC_LIB 1
#define LIBSTUDXML_EXTERNAL_EXPAT 1
#endif /* XML_DETAILS_CONFIG_H */