From 07082d0b3e5394376654873819eac84addc52316 Mon Sep 17 00:00:00 2001
From: Thomas Fussell <thomas.fussell@gmail.com>
Date: Fri, 16 Sep 2016 23:22:34 -0400
Subject: [PATCH] update cmake scripts

---
 cmake/xlnt.cmake      | 4 ++--
 cmake/xlnt.test.cmake | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/cmake/xlnt.cmake b/cmake/xlnt.cmake
index 4d28b528..1dc61da0 100644
--- a/cmake/xlnt.cmake
+++ b/cmake/xlnt.cmake
@@ -27,6 +27,7 @@ endif()
 include_directories(include)
 include_directories(include/xlnt)
 include_directories(source)
+include_directories(source/detail)
 include_directories(third-party/miniz)
 include_directories(third-party/libstudxml)
 include_directories(third-party/utfcpp/source)
@@ -63,8 +64,7 @@ FILE(GLOB DETAIL_SOURCES source/detail/*.cpp)
 SET(SOURCES ${CELL_SOURCES} ${CHARTS_SOURCES} ${CHARTSHEET_SOURCES} ${DRAWING_SOURCES} ${FORMULA_SOURCES} ${PACKAGING_SOURCES} ${SERIALIZATION_SOURCES} ${STYLES_SOURCES} ${UTILS_SOURCES} ${WORKBOOK_SOURCES} ${WORKSHEET_SOURCES} ${DETAIL_SOURCES})
 
 SET(MINIZ ../third-party/miniz/miniz.c ../third-party/miniz/miniz.h)
-
-SET(LIBSTUDXML ../third-party/libstudxml/xml/parser.cxx)
+SET(LIBSTUDXML ../third-party/libstudxml/xml/parser.cxx ../third-party/libstudxml/xml/qname.cxx ../third-party/libstudxml/xml/serializer.cxx ../third-party/libstudxml/xml/value-traits.cxx ../third-party/libstudxml/xml/details/expat/xmlparse.c ../third-party/libstudxml/xml/details/expat/xmlrole.c ../third-party/libstudxml/xml/details/expat/xmltok_impl.c ../third-party/libstudxml/xml/details/expat/xmltok_ns.c ../third-party/libstudxml/xml/details/expat/xmltok.c ../third-party/libstudxml/xml/details/genx/char-props.c ../third-party/libstudxml/xml/details/genx/genx.c)
 
 if(SHARED)
     add_library(xlnt.shared SHARED ${HEADERS} ${SOURCES} ${MINIZ} ${LIBSTUDXML})
diff --git a/cmake/xlnt.test.cmake b/cmake/xlnt.test.cmake
index 81e90a6e..2f801610 100644
--- a/cmake/xlnt.test.cmake
+++ b/cmake/xlnt.test.cmake
@@ -19,6 +19,7 @@ FILE(GLOB WORKBOOK_TESTS source/workbook/tests/test_*.hpp)
 FILE(GLOB WORKSHEET_TESTS source/worksheet/tests/test_*.hpp)
 
 SET(TESTS ${CELL_TESTS} ${CHARTS_TESTS} ${CHARTSHEET_TESTS} ${DRAWING_TESTS} ${FORMULA_TESTS} ${PACKAGING_TESTS} ${SERIALIZATION_TESTS} ${STYLES_TESTS} ${UTILS_TESTS} ${WORKBOOK_TESTS} ${WORKSHEET_TESTS})
+SET(PUGIXML ../third-party/pugixml/src/pugixml.cpp)
 
 FILE(GLOB TEST_HELPERS_HEADERS tests/helpers/*.hpp)
 FILE(GLOB TEST_HELPERS_SOURCES tests/helpers/*.cpp)
@@ -29,7 +30,7 @@ file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/tests")
 SET(RUNNER "${CMAKE_CURRENT_BINARY_DIR}/tests/runner-autogen.cpp")
 SET_SOURCE_FILES_PROPERTIES(${RUNNER} PROPERTIES GENERATED TRUE)
 
-add_executable(xlnt.test ${TEST_HELPERS} ${TESTS} ${RUNNER} )
+add_executable(xlnt.test ${TEST_HELPERS} ${TESTS} ${RUNNER} ${PUGIXML})
 
 source_group(helpers FILES ${TEST_HELPERS})
 source_group(tests\\cell FILES ${CELL_TESTS})