From 3184488cff375cd79ff85aac6488647a28d471c2 Mon Sep 17 00:00:00 2001 From: Mikhail Pak Date: Wed, 31 Oct 2018 18:37:47 +0100 Subject: [PATCH 1/2] Updated googletest to 1.8.1 --- external/googletest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/googletest b/external/googletest index c994585..2fe3bd9 160000 --- a/external/googletest +++ b/external/googletest @@ -1 +1 @@ -Subproject commit c99458533a9b4c743ed51537e25989ea55944908 +Subproject commit 2fe3bd994b3189899d93f1d5a881e725e046fdc2 From e0db7edebc7fb8b5a9381c199b756fa627ea6d4f Mon Sep 17 00:00:00 2001 From: Mikhail Pak Date: Wed, 31 Oct 2018 18:44:37 +0100 Subject: [PATCH 2/2] Raise minimum CMake version to 3.0, use VERSION argument --- CMakeLists.txt | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b78acb9..ab2abe1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,12 +1,10 @@ -cmake_minimum_required(VERSION 2.8) -project(Kalman CXX) +cmake_minimum_required(VERSION 3.0) -# TODO: Use VERSION argument to project command after raising the minimum -# cmake version to 3.0 -set(PROJECT_VERSION_MAJOR 0) -set(PROJECT_VERSION_MINOR 1) -set(PROJECT_VERSION_PATCH 0) -set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}) +if (POLICY CMP0048) + cmake_policy(SET CMP0048 NEW) +endif(POLICY CMP0048) + +project(Kalman VERSION 0.1.0 LANGUAGES CXX) include(CTest) @@ -64,12 +62,12 @@ endif() set(TESTS # EKF test/ExtendedKalmanFilter.cpp - + # UKF test/UnscentedKalmanFilterBase.cpp test/UnscentedKalmanFilter.cpp test/SquareRootUnscentedKalmanFilter.cpp - + # Utils test/StandardBase.cpp test/SquareRootBase.cpp