Do CMake properly

Author: TartanLlama

.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,35 +1,31 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.8)
 
-project(function_ref)
+project(tl-function_ref VERSION 1.0.0 LANGUAGES CXX)
 
-# Prepare "Catch" library for other executables
-set(CATCH_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/test)
-add_library(Catch INTERFACE)
-target_include_directories(Catch INTERFACE ${CATCH_INCLUDE_DIR})
-
-# Make test executable
-set(TEST_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/tests/main.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/tests/constructors.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/tests/call.cpp  
-  ${CMAKE_CURRENT_SOURCE_DIR}/tests/issues.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/tests/assignment.cpp)
-
-add_executable(tests ${TEST_SOURCES})
+option(FUNCTION_REF_ENABLE_TESTS "Enable tests." ON)
 
-add_library(function_ref INTERFACE)
-target_sources(function_ref INTERFACE ${CMAKE_SOURCE_DIR}/function_ref.hpp)
-target_include_directories(function_ref INTERFACE ${CMAKE_SOURCE_DIR})
+set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/tl-cmake" ${CMAKE_MODULE_PATH})
+include(add-tl)
 
-target_link_libraries(tests Catch function_ref)
-set_property(TARGET tests PROPERTY CXX_STANDARD 14)
+tl_add_library(function-ref SOURCES 
+               include/tl/function_ref.hpp)
 
+# Prepare "Catch" library for other executables
+set(CATCH_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/test)
+add_library(Catch INTERFACE)
+target_include_directories(Catch INTERFACE ${CATCH_INCLUDE_DIR})
 
-find_package(standardese) # find standardese after installation
-
-# generates a custom target that will run standardese to generate the documentation
-if (standardese_FOUND)
-standardese_generate(function_ref
-                     INCLUDE_DIRECTORY .
-                     CONFIG ${CMAKE_SOURCE_DIR}/standardese.config
-                     INPUT function_ref.hpp)
-endif ()
+if(FUNCTION_REF_ENABLE_TESTS)
+  # Make test executable
+  set(TEST_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/tests/main.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/tests/constructors.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/tests/call.cpp  
+    ${CMAKE_CURRENT_SOURCE_DIR}/tests/issues.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/tests/assignment.cpp)
+  
+  add_executable(tests ${TEST_SOURCES})
+  
+  target_link_libraries(tests Catch function-ref)
+
+  set_property(TARGET tests PROPERTY CXX_STANDARD 14)
+endif()

cmake/tl-cmake

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

cmake/tl-function-ref-config.cmake.in

@@ -14,8 +14,9 @@
 #ifndef TL_FUNCTION_REF_HPP
 #define TL_FUNCTION_REF_HPP
 
-#define TL_FUNCTION_REF_VERSION_MAJOR 0
-#define TL_FUNCTION_REF_VERSION_MINOR 2
+#define TL_FUNCTION_REF_VERSION_MAJOR 1
+#define TL_FUNCTION_REF_VERSION_MINOR 0
+#define TL_FUNCTION_REF_VERSION_PATCH 0
 
 #if (defined(_MSC_VER) && _MSC_VER == 1900)
 /// \exclude

function_ref.hpp include/tl/function_ref.hppfunction_ref.hpp renamed to include/tl/function_ref.hpp

@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "function_ref.hpp"
+#include <tl/function_ref.hpp>
 
 void f(){}
 struct b {

tests/assignment.cpp

@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "function_ref.hpp"
+#include <tl/function_ref.hpp>
 
 namespace {
 bool f_called = false;

tests/call.cpp

@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "function_ref.hpp"
+#include <tl/function_ref.hpp>
 
 void foo(){}
 struct bar {

tests/constructors.cpp

@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "function_ref.hpp"
+#include <tl/function_ref.hpp>
 
 TEST_CASE("Issue #2") {
 	const auto lam = [](int ) {};