From 7c464475e22f602538caeef1757cfa478accc02d Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Fri, 13 Jul 2018 16:53:49 +0200
Subject: [PATCH 1/2] Update cmake
---
cmake_modules/morse_cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake_modules/morse_cmake b/cmake_modules/morse_cmake
index 3c4da39c3..dd40b792c 160000
--- a/cmake_modules/morse_cmake
+++ b/cmake_modules/morse_cmake
@@ -1 +1 @@
-Subproject commit 3c4da39c32e8a80c6af48ef066f9d5ebbba08aff
+Subproject commit dd40b792c7f27bd8644e7837b17dbc876f92eec7
--
GitLab
From 931f76e7edece02c26d1119d78446c36e335aa9a Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Fri, 13 Jul 2018 16:55:12 +0200
Subject: [PATCH 2/2] Restore MORSE where it should be
---
cmake_modules/gitlab-ci-initial-cache.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmake_modules/gitlab-ci-initial-cache.cmake b/cmake_modules/gitlab-ci-initial-cache.cmake
index 8bc6792b1..f472d6142 100644
--- a/cmake_modules/gitlab-ci-initial-cache.cmake
+++ b/cmake_modules/gitlab-ci-initial-cache.cmake
@@ -2,5 +2,5 @@ set(BUILD_SHARED_LIBS "ON" CACHE BOOL "")
set(CMAKE_INSTALL_PREFIX "$ENV{PWD}/install" CACHE PATH "")
set(CMAKE_VERBOSE_MAKEFILE "ON" CACHE BOOL "")
-option(CHAMELEON_ENABLE_WARNING "Enable warning messages" ON)
-option(CHAMELEON_ENABLE_COVERAGE "Enable flags for coverage test" ON)
+option(MORSE_ENABLE_WARNING "Enable warning messages" ON)
+option(MORSE_ENABLE_COVERAGE "Enable flags for coverage test" ON)
--
GitLab