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

Fixes static build for msvc.

Browse Source
This commit is contained in:
Xpol Wan 2016-07-05 13:03:00 +08:00
parent 076d42280e
commit 4976f54145
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/xlnt.cmake
View File

@ -103,7 +103,7 @@ endif()
if(STATIC) if(STATIC)
add_library(xlnt.static STATIC ${HEADERS} ${SOURCES} ${MINIZ} ${PUGIXML}) add_library(xlnt.static STATIC ${HEADERS} ${SOURCES} ${MINIZ} ${PUGIXML})
target_compile_definitions(xlnt.static PRIVATE XLNT_STATIC=1) target_compile_definitions(xlnt.static PUBLIC XLNT_STATIC=1)
install(TARGETS xlnt.static install(TARGETS xlnt.static
LIBRARY DESTINATION ${LIB_DEST_DIR} LIBRARY DESTINATION ${LIB_DEST_DIR}
ARCHIVE DESTINATION ${LIB_DEST_DIR} ARCHIVE DESTINATION ${LIB_DEST_DIR}

2
include/xlnt/xlnt_config.hpp
View File

@ -55,7 +55,7 @@ enum class limit_style
const limit_style LimitStyle = limit_style::openpyxl; const limit_style LimitStyle = limit_style::openpyxl;
#ifndef XLNT_API #ifndef XLNT_API
#if defined(_DLL) && defined(_MSC_VER) #if !defined(XLNT_STATIC) && defined(_MSC_VER)
#ifdef XLNT_EXPORT #ifdef XLNT_EXPORT
#define XLNT_API __declspec(dllexport) #define XLNT_API __declspec(dllexport)
#else #else