ref #125, CMake warning with 3.20

edbee · Apr 22, 2021 · 5bfdb6a · 5bfdb6a
1 parent d098739
commit 5bfdb6a
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 71 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 edbee.lib:
 
+- fix #125, CMake 3.20 Deprecation Waring
 - fix #123, Clicking on TextMarginComponet now moves focus to TextEditorComponent
 - fix #121, Standard Keys not working correctly (Fixed by fetching ALL keybindings via QKeySequence::keyBinding)
 - fix #119, Missing `case MoveCaretToWordBoundary:` in `switch` statement

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,4 @@
-# Should be called before PROJECT.
-CMAKE_MINIMUM_REQUIRED(VERSION 3.1)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.1...3.20)
 
 PROJECT(edbee)
 

diff --git a/edbee-lib/CMakeLists.txt b/edbee-lib/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Should be called before PROJECT.
-CMAKE_MINIMUM_REQUIRED(VERSION 3.1)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.1...3.20)
 
 IF(POLICY CMP0020)
   CMAKE_POLICY(SET CMP0020 NEW)

diff --git a/edbee-test/CMakeLists.txt b/edbee-test/CMakeLists.txt
@@ -1,5 +1,4 @@
-# Should be called before PROJECT.
-CMAKE_MINIMUM_REQUIRED(VERSION 3.1)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.1...3.20)
 
 IF(POLICY CMP0020)
   CMAKE_POLICY(SET CMP0020 NEW)

diff --git a/vendor/onig/CMakeLists.txt b/vendor/onig/CMakeLists.txt
@@ -12,75 +12,75 @@ SET(ONIG_INCLUDE_DIRS
 )
 
 SET(ONIG_SOURCES
-           ${CMAKE_CURRENT_SOURCE_DIR}/regcomp.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/regenc.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/regerror.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/regexec.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/regext.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/reggnu.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/regparse.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/regposerr.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/regposix.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/regsyntax.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/regtrav.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/regversion.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/st.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/ascii.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/big5.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/cp949.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/emacs_mule.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/euc_jp.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/euc_kr.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/euc_tw.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/gb18030.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/gbk.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859.h 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_1.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_10.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_11.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_13.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_14.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_15.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_16.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_2.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_3.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_4.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_5.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_6.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_7.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_8.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_9.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/koi8_r.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/koi8_u.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/shift_jis.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/unicode.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/us_ascii.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/utf_16be.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/utf_16le.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/utf_32be.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/utf_32le.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/utf_8.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/windows_1250.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/windows_1251.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/windows_1252.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/windows_1253.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/windows_1254.c 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/windows_1257.c 
+           ${CMAKE_CURRENT_SOURCE_DIR}/regcomp.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/regenc.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/regerror.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/regexec.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/regext.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/reggnu.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/regparse.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/regposerr.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/regposix.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/regsyntax.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/regtrav.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/regversion.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/st.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/ascii.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/big5.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/cp949.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/emacs_mule.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/euc_jp.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/euc_kr.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/euc_tw.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/gb18030.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/gbk.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859.h
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_1.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_10.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_11.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_13.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_14.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_15.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_16.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_2.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_3.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_4.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_5.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_6.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_7.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_8.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_9.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/koi8_r.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/koi8_u.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/shift_jis.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/unicode.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/us_ascii.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/utf_16be.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/utf_16le.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/utf_32be.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/utf_32le.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/utf_8.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/windows_1250.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/windows_1251.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/windows_1252.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/windows_1253.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/windows_1254.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/windows_1257.c
            ${CMAKE_CURRENT_SOURCE_DIR}/enc/windows_31j.c
            PARENT_SCOPE
 )
 
 SET(ONIG_HEADERS
-           ${CMAKE_CURRENT_SOURCE_DIR}/config.h 
-           ${CMAKE_CURRENT_SOURCE_DIR}/enc/unicode/casefold.h 
-           ${CMAKE_CURRENT_SOURCE_DIR}/onigmo.h 
-           ${CMAKE_CURRENT_SOURCE_DIR}/onigmognu.h 
-           ${CMAKE_CURRENT_SOURCE_DIR}/onigmoposix.h 
-           ${CMAKE_CURRENT_SOURCE_DIR}/regenc.h 
-           ${CMAKE_CURRENT_SOURCE_DIR}/regint.h 
-           ${CMAKE_CURRENT_SOURCE_DIR}/regparse.h 
-           ${CMAKE_CURRENT_SOURCE_DIR}/st.h 
-           ${CMAKE_CURRENT_SOURCE_DIR}/win32/config.h 
+           ${CMAKE_CURRENT_SOURCE_DIR}/config.h
+           ${CMAKE_CURRENT_SOURCE_DIR}/enc/unicode/casefold.h
+           ${CMAKE_CURRENT_SOURCE_DIR}/onigmo.h
+           ${CMAKE_CURRENT_SOURCE_DIR}/onigmognu.h
+           ${CMAKE_CURRENT_SOURCE_DIR}/onigmoposix.h
+           ${CMAKE_CURRENT_SOURCE_DIR}/regenc.h
+           ${CMAKE_CURRENT_SOURCE_DIR}/regint.h
+           ${CMAKE_CURRENT_SOURCE_DIR}/regparse.h
+           ${CMAKE_CURRENT_SOURCE_DIR}/st.h
+           ${CMAKE_CURRENT_SOURCE_DIR}/win32/config.h
            ${CMAKE_CURRENT_SOURCE_DIR}/config-onig-edbee.h
            PARENT_SCOPE
 )
diff --git a/vendor/qslog/CMakeLists.txt b/vendor/qslog/CMakeLists.txt
@@ -1,5 +1,4 @@
-# CMake build support courtesy of Axel Gembe <axel@gembe.net>
-cmake_minimum_required(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.1...3.20)
 
 project(QsLog)