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

appveyor.yml

@@ -1,14 +1,26 @@
 version: '{build}'
 os: Visual Studio 2015
+
+configuration:
+- Debug
+
+environment:
+  matrix:
+  - SHARED: ON
+    STATIC: OFF
+  - SHARED: OFF
+    STATIC: ON
+
 init: []
 install: []
-build_script:
+before_build:
-- git submodule init
+- git submodule update --init --recursive
-- git submodule update
+- cmake -H. -Bbuild -G"Visual Studio 14 2015 Win64" -DSHARED=%SHARED% -DSTATIC=%STATIC% -DTESTS=ON
-- set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
+
-- mkdir build
+build:
-- cd build
+  project: build\xlnt.sln
-- cmake -G "Visual Studio 14 2015 Win64" -D SHARED=1 -D TESTS=1 ..
+  parallel: true
-- cmake --build . --config Debug
+  verbosity: minimal
+
 test_script:
-- bin\xlnt.test.exe
+- build\bin\xlnt.test.exe

cmake/xlnt.cmake

@@ -103,7 +103,7 @@ endif()
 
 if(STATIC)
     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
         LIBRARY DESTINATION ${LIB_DEST_DIR}
         ARCHIVE DESTINATION ${LIB_DEST_DIR}

include/xlnt/xlnt_config.hpp

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