From 3339c3ef7e7ee2c80f8d5d635fe8e1ff0e287d14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Thu, 30 Apr 2020 09:02:31 +0200 Subject: [PATCH 1/6] Try to get OF going on Mac with cmake 3.17 --- CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5a8bd826a..11574221b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,12 @@ # Required 3.12 to use findPython3 cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR) + +# AutoMOC/AutoUIC +if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.17") + cmake_policy(SET CMP0100 NEW) +endif() + file(SHA512 ${CMAKE_SOURCE_DIR}/CMakeLists.txt HASH_TOPLEVEL_CMAKEFILE) file(SHA512 ${CMAKE_SOURCE_DIR}/OpenFlipper/cmake/CMakeLists.txt HASH_LATEST_CMAKEFILE) -- GitLab From 52a0e049c38a915752281eef677ac09298d25024 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Thu, 30 Apr 2020 09:10:39 +0200 Subject: [PATCH 2/6] Added debug output --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 11574221b..8f6ceb81c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,9 +3,12 @@ # Required 3.12 to use findPython3 cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR) +message("${CMAKE_VERSION}") + # AutoMOC/AutoUIC if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.17") + message("Setting Policy") cmake_policy(SET CMP0100 NEW) endif() -- GitLab From a7358f5f52b981969d6b2625911e29136041f35b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Thu, 30 Apr 2020 09:14:17 +0200 Subject: [PATCH 3/6] Updated OM --- OpenFlipper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenFlipper b/OpenFlipper index ec13e8ca0..1f3e146f9 160000 --- a/OpenFlipper +++ b/OpenFlipper @@ -1 +1 @@ -Subproject commit ec13e8ca08440e26d58bde8c087fc540e2830f96 +Subproject commit 1f3e146f948581b24ca29b5ade45935b798102c1 -- GitLab From eee5099856c49cd0163f66e319d3d0d72244a563 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Thu, 30 Apr 2020 09:16:41 +0200 Subject: [PATCH 4/6] Updated CMakeLists --- OpenFlipper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenFlipper b/OpenFlipper index 1f3e146f9..a548511ea 160000 --- a/OpenFlipper +++ b/OpenFlipper @@ -1 +1 @@ -Subproject commit 1f3e146f948581b24ca29b5ade45935b798102c1 +Subproject commit a548511ea69c3533769b41fc4d2b091d3ca6f353 -- GitLab From d60db862bf866bf93556675f52e49461a8902a83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Thu, 30 Apr 2020 09:17:09 +0200 Subject: [PATCH 5/6] Updated CMakeLists --- CMakeLists.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f6ceb81c..1c88d5e10 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,12 +3,8 @@ # Required 3.12 to use findPython3 cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR) -message("${CMAKE_VERSION}") - - # AutoMOC/AutoUIC if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.17") - message("Setting Policy") cmake_policy(SET CMP0100 NEW) endif() -- GitLab From c61270bbc694b143773136c0f784d7cc01b8f6fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Thu, 30 Apr 2020 11:45:02 +0200 Subject: [PATCH 6/6] Updated OM to 9.0 Dev release --- OpenFlipper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenFlipper b/OpenFlipper index a548511ea..3a645c666 160000 --- a/OpenFlipper +++ b/OpenFlipper @@ -1 +1 @@ -Subproject commit a548511ea69c3533769b41fc4d2b091d3ca6f353 +Subproject commit 3a645c6667be75bf9d0a09ba4721b0f06f609a53 -- GitLab