Merge branch 'master' of github.com:asutton/origin

CMakeLists.txt

@@ -1,5 +1,3 @@
-# Copyright (c) 2008-2013 Andrew Sutton
-#
 # This file is distributed under the MIT License. See the accompanying file
 # LICENSE.txt or http://www.opensource.org/licenses/mit-license.php for terms
 # and conditions.
@@ -8,7 +6,7 @@ cmake_minimum_required(VERSION 2.8)
 
 # Set the project, required language, and default flags.
 project(origin CXX)
-set(CMAKE_CXX_FLAGS -std=c++1y)
+set(CMAKE_CXX_FLAGS -std=c++1z)
 
 enable_testing()
 

origin/CMakeLists.txt

@@ -1,8 +1,9 @@
-# Copyright (c) 2008-2013 Andrew Sutton
-#
 # This file is distributed under the MIT License. See the accompanying file
 # LICENSE.txt or http://www.opensource.org/licenses/mit-license.php for terms
 # and conditions.
 
 add_subdirectory(core)
+add_subdirectory(memory)
+add_subdirectory(numeric)
 add_subdirectory(sequence)
+add_subdirectory(data)

origin/core/CMakeLists.txt

@@ -1,8 +1,17 @@
-# Copyright (c) 2008-2014 Andrew Sutton
-#
 # This file is distributed under the MIT License. See the accompanying file
 # LICENSE.txt or http://www.opensource.org/licenses/mit-license.php for terms
 # and conditions.
 
+add_library(origin-core
+  traits.cpp
+  concepts.cpp
+  function.cpp
+  type.cpp
+)
+
+# FIXME: The tests in this library need to link against
+# the origin-core library.
+
 add_subdirectory(concepts.test)
 add_subdirectory(function.test)
+

origin/core/concepts.cpp

@@ -0,0 +1,5 @@
+// This file is distributed under the MIT License. See the accompanying file
+// LICENSE.txt or http://www.opensource.org/licenses/mit-license.php for terms
+// and conditions.
+
+#include "concepts.hpp"