From 3bdc099c0f70e396db965dcc0cd2049153ca3c8d Mon Sep 17 00:00:00 2001 From: Adam <5563693+adamvm@users.noreply.github.com> Date: Sat, 22 Feb 2020 09:48:23 +0100 Subject: [PATCH 1/4] Update CMakeLists.txt Add Conan pakage manager --- CMakeLists.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 84820de..757c799 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,6 +23,20 @@ find_package(Boost COMPONENTS program_options thread REQUIRED) include_directories(${Boost_INCLUDE_DIR}) link_directories(${Boost_LIBRARY_DIR}) +# Get Conan package manager + +if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake") + message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan") + file(DOWNLOAD "https://github.com/conan-io/cmake-conan/raw/v0.15/conan.cmake" + "${CMAKE_BINARY_DIR}/conan.cmake") +endif() + +include(${CMAKE_BINARY_DIR}/conan.cmake) + +conan_cmake_run(REQUIRES fmt/6.0.0@bincrafters/stable + BASIC_SETUP + BUILD missing) + add_definitions(-Wno-unused-variable) add_definitions(-Wno-unused-parameter) add_definitions(-Wall -Werror -pedantic -Wextra) From 9d31c89dcd82f4ded20179675f51df2c8123fc16 Mon Sep 17 00:00:00 2001 From: Adam <5563693+adamvm@users.noreply.github.com> Date: Sat, 22 Feb 2020 09:57:21 +0100 Subject: [PATCH 2/4] Update CMakeLists.txt Add DCMAKE_BUILD_TYPE=Release --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 757c799..a96f000 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,6 +37,7 @@ conan_cmake_run(REQUIRES fmt/6.0.0@bincrafters/stable BASIC_SETUP BUILD missing) +add_definition(-DCMAKE_BUILD_TYPE=Release) add_definitions(-Wno-unused-variable) add_definitions(-Wno-unused-parameter) add_definitions(-Wall -Werror -pedantic -Wextra) From da734883feb47d6b8b8e18ccd014253c31a10c83 Mon Sep 17 00:00:00 2001 From: Adam <5563693+adamvm@users.noreply.github.com> Date: Mon, 24 Feb 2020 17:24:25 +0100 Subject: [PATCH 3/4] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4fbaa00..9fd645e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ install: fi script: - - CXX=/usr/bin/g++-8 CC=/usr/bin/gcc-8 cmake . + - CXX=/usr/bin/g++-8 CC=/usr/bin/gcc-8 cmake -DCMAKE_BUILD_TYPE=Release . - ${DEPS_DIR}/cmake/bin/cmake --build . - ./gtests - valgrind -v --error-exitcode=42 --leak-check=full ./gtests From 11cd3c0a12ed5636b78d4a43bb62892b73dd01fa Mon Sep 17 00:00:00 2001 From: Adam <5563693+adamvm@users.noreply.github.com> Date: Mon, 24 Feb 2020 17:28:12 +0100 Subject: [PATCH 4/4] Update CMakeLists.txt --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a96f000..757c799 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,6 @@ conan_cmake_run(REQUIRES fmt/6.0.0@bincrafters/stable BASIC_SETUP BUILD missing) -add_definition(-DCMAKE_BUILD_TYPE=Release) add_definitions(-Wno-unused-variable) add_definitions(-Wno-unused-parameter) add_definitions(-Wall -Werror -pedantic -Wextra)