Do CMake properly

.appveyor.yml

@@ -3,6 +3,7 @@ os:
 - Visual Studio 2017
 
 build_script:
+  - git submodule update --init --recursive
   - mkdir build
   - cd build
   - cmake ..

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "cmake/tl-cmake"]
+	path = cmake/tl-cmake
+	url = https://github.com/TartanLlama/tl-cmake.git

CMakeLists.txt

@@ -1,12 +1,14 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.8)
 
-project(optional)
+project(tl-optional VERSION 1.0.0 LANGUAGES CXX)
 
 option(OPTIONAL_ENABLE_TESTS "Enable tests." ON)
 
-add_library(optional INTERFACE)
-target_sources(optional INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/tl/optional.hpp)
-target_include_directories(optional INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/tl)
+set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/tl-cmake" ${CMAKE_MODULE_PATH})
+include(add-tl)
+
+tl_add_library(optional SOURCES 
+                include/tl/optional.hpp)
 
 if(OPTIONAL_ENABLE_TESTS)
   # Prepare "Catch" library for other executables

cmake/tl-optional-config.cmake.in

@@ -0,0 +1,3 @@
+@PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/tl-optional-targets.cmake")

include/tl/optional.hpp

@@ -15,8 +15,9 @@
 #ifndef TL_OPTIONAL_HPP
 #define TL_OPTIONAL_HPP
 
-#define TL_OPTIONAL_VERSION_MAJOR 0
-#define TL_OPTIONAL_VERSION_MINOR 5
+#define TL_OPTIONAL_VERSION_MAJOR 1
+#define TL_OPTIONAL_VERSION_MINOR 0
+#define TL_OPTIONAL_VERSION_PATCH 0
 
 #include <exception>
 #include <functional>

tests/assignment.cpp

@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "optional.hpp"
+#include <tl/optional.hpp>
 
 TEST_CASE("Assignment value", "[assignment.value]") {
     tl::optional<int> o1 = 42;

tests/bases.cpp

@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "optional.hpp"
+#include <tl/optional.hpp>
 
 // Old versions of GCC don't have the correct trait names. Could fix them up if needs be.
 #if (defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ <= 9 &&              \

tests/constexpr.cpp

@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "optional.hpp"
+#include <tl/optional.hpp>
 
 #define TOKENPASTE(x, y) x##y
 #define TOKENPASTE2(x, y) TOKENPASTE(x, y)

tests/constructors.cpp

@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "optional.hpp"
+#include <tl/optional.hpp>
 #include <vector>
 
 struct foo {

tests/emplace.cpp

@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "optional.hpp"
+#include <tl/optional.hpp>
 #include <utility>
 #include <tuple>
 

tests/extensions.cpp

@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "optional.hpp"
+#include <tl/optional.hpp>
 #include <string>
 
 #define TOKENPASTE(x, y) x##y

tests/hash.cpp

@@ -1,4 +1,4 @@
 #include "catch.hpp"
-#include "optional.hpp"
+#include <tl/optional.hpp>
 
 TEST_CASE("Hashing", "[hash]") {}

tests/in_place.cpp

@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "optional.hpp"
+#include <tl/optional.hpp>
 
 #include <tuple>
 #include <vector>

tests/issues.cpp

@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "optional.hpp"
+#include <tl/optional.hpp>
 #include <type_traits>
 
 struct foo{

tests/make_optional.cpp

@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "optional.hpp"
+#include <tl/optional.hpp>
 
 #include <tuple>
 #include <vector>

tests/noexcept.cpp

@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "optional.hpp"
+#include <tl/optional.hpp>
 
 TEST_CASE("Noexcept", "[noexcept]") {
   tl::optional<int> o1{4};

tests/nullopt.cpp

@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "optional.hpp"
+#include <tl/optional.hpp>
 
 TEST_CASE("Nullopt", "[nullopt]") {
   tl::optional<int> o1 = tl::nullopt;

tests/observers.cpp

@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "optional.hpp"
+#include <tl/optional.hpp>
 
 struct move_detector {
   move_detector() = default;

tests/relops.cpp

@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "optional.hpp"
+#include <tl/optional.hpp>
 
 TEST_CASE("Relational ops", "[relops]") {
   tl::optional<int> o1{4};