Do CMake properly

.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(expected)
+project(tl-expected VERSION 1.0.0 LANGUAGES CXX)
 
 option(EXPECTED_ENABLE_TESTS "Enable tests." ON)
 
-add_library(expected INTERFACE)
+set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/tl-cmake" ${CMAKE_MODULE_PATH})
-target_sources(expected INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/tl/expected.hpp)
+include(add-tl)
-target_include_directories(expected INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/tl)
+
+tl_add_library(expected SOURCES 
+               include/tl/expected.hpp)
 
 # Prepare "Catch" library for other executables
 set(CATCH_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/test)

cmake/tl-expected-config.cmake.in

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

conanfile.py

@@ -12,8 +12,8 @@ class ExpectedConan(ConanFile):
     exports_sources = "*"
 
     def source(self):
-        tools.replace_in_file('CMakeLists.txt', 'project(expected)',
+        tools.replace_in_file('CMakeLists.txt', 'project(tl-expected)',
-        '''project(expected)
+        '''project(tl-expected)
 include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
 conan_basic_setup()
         ''')
@@ -31,4 +31,4 @@ conan_basic_setup()
             self.run('%s/bin/tests' % self.build_folder)
 
     def package(self):
-        self.copy('*.hpp', dst='include/tl', src='tl')
+        self.copy('*.hpp', dst='include/tl', src='include/tl')

tests/assignment.cpp

@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "expected.hpp"
+#include <tl/expected.hpp>
 
 TEST_CASE("Simple assignment", "[assignment.simple]") {
   tl::expected<int, int> e1 = 42;

tests/bases.cpp

@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "expected.hpp"
+#include <tl/expected.hpp>
 
 #include <string>
 

tests/constexpr.cpp

@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "expected.hpp"
+#include <tl/expected.hpp>
 
 TEST_CASE("Constexpr", "[constexpr]") {
     //TODO

tests/constructors.cpp

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

tests/emplace.cpp

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

tests/extensions.cpp

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

tests/issues.cpp

@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "expected.hpp"
+#include <tl/expected.hpp>
 
 #include <string>
 

tests/noexcept.cpp

@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "expected.hpp"
+#include <tl/expected.hpp>
 
 TEST_CASE("Noexcept", "[noexcept]") {
     //TODO

tests/observers.cpp

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

tests/relops.cpp

@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "expected.hpp"
+#include <tl/expected.hpp>
 
 TEST_CASE("Relational operators", "[relops]") {
     //TODO

tests/swap.cpp

@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "expected.hpp"
+#include <tl/expected.hpp>
 
 struct no_throw {
   no_throw(std::string i) : i(i) {}