diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt
index 378e630e..724e5aa6 100644
--- a/build/cmake/CMakeLists.txt
+++ b/build/cmake/CMakeLists.txt
@@ -1,7 +1,8 @@
-cmake_minimum_required(VERSION 3.3.2)
+cmake_minimum_required(VERSION 3.2.2)
 
 project(xlnt)
 
+set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -std=c++1y)
 set(CMAKE_OSX_DEPLOYMENT_TARGET 10.10)
 
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../../../lib)
diff --git a/build/cmake/xlnt.test/CMakeLists.txt b/build/cmake/xlnt.test/CMakeLists.txt
index f90432b2..cbb4c431 100644
--- a/build/cmake/xlnt.test/CMakeLists.txt
+++ b/build/cmake/xlnt.test/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.9)
+cmake_minimum_required(VERSION 3.2.2)
 project(xlnt.test)
 include_directories(../../../include)
 include_directories(../../../third-party/pugixml/src)
diff --git a/build/cmake/xlnt/CMakeLists.txt b/build/cmake/xlnt/CMakeLists.txt
index 64652a72..e331164a 100644
--- a/build/cmake/xlnt/CMakeLists.txt
+++ b/build/cmake/xlnt/CMakeLists.txt
@@ -1,11 +1,13 @@
-cmake_minimum_required(VERSION 2.8.9)
+cmake_minimum_required(VERSION 3.2.2)
 project(xlnt)
 
 include_directories(../../../include)
+include_directories(../../../source)
 include_directories(../../../third-party/miniz)
 include_directories(../../../third-party/pugixml/src)
 
-FILE(GLOB SOURCES ../../../source/*.cpp)
+FILE(GLOB SOURCES ../../../source/*/*.cpp)
 FILE(GLOB DETAIL_SOURCES ../../../source/detail/*.cpp)
+
 add_library(xlnt STATIC ${SOURCES} ${DETAIL_SOURCES} ../../../third-party/pugixml/src/pugixml.cpp ../../../third-party/miniz/miniz.c)