Skip to content

Commit 64db40d

Browse files
gamecreaturegamecreature
committed
ref edbee#125, CMake warning with 3.20
1 parent d098739 commit 64db40d

6 files changed

Lines changed: 69 additions & 71 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
edbee.lib:
44

5+
- fix #125, CMake 3.20 Deprecation Warning
56
- fix #123, Clicking on TextMarginComponet now moves focus to TextEditorComponent
67
- fix #121, Standard Keys not working correctly (Fixed by fetching ALL keybindings via QKeySequence::keyBinding)
78
- fix #119, Missing `case MoveCaretToWordBoundary:` in `switch` statement

‎CMakeLists.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# Should be called before PROJECT.
2-
CMAKE_MINIMUM_REQUIRED(VERSION 3.1)
1+
CMAKE_MINIMUM_REQUIRED(VERSION 3.1...3.20)
32

43
PROJECT(edbee)
54

‎edbee-lib/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Should be called before PROJECT.
2-
CMAKE_MINIMUM_REQUIRED(VERSION 3.1)
2+
CMAKE_MINIMUM_REQUIRED(VERSION 3.1...3.20)
33

44
IF(POLICY CMP0020)
55
CMAKE_POLICY(SET CMP0020 NEW)

‎edbee-test/CMakeLists.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# Should be called before PROJECT.
2-
CMAKE_MINIMUM_REQUIRED(VERSION 3.1)
1+
CMAKE_MINIMUM_REQUIRED(VERSION 3.1...3.20)
32

43
IF(POLICY CMP0020)
54
CMAKE_POLICY(SET CMP0020 NEW)

‎vendor/onig/CMakeLists.txt‎

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -12,75 +12,75 @@ SET(ONIG_INCLUDE_DIRS
1212
)
1313

1414
SET(ONIG_SOURCES
15-
${CMAKE_CURRENT_SOURCE_DIR}/regcomp.c
16-
${CMAKE_CURRENT_SOURCE_DIR}/regenc.c
17-
${CMAKE_CURRENT_SOURCE_DIR}/regerror.c
18-
${CMAKE_CURRENT_SOURCE_DIR}/regexec.c
19-
${CMAKE_CURRENT_SOURCE_DIR}/regext.c
20-
${CMAKE_CURRENT_SOURCE_DIR}/reggnu.c
21-
${CMAKE_CURRENT_SOURCE_DIR}/regparse.c
22-
${CMAKE_CURRENT_SOURCE_DIR}/regposerr.c
23-
${CMAKE_CURRENT_SOURCE_DIR}/regposix.c
24-
${CMAKE_CURRENT_SOURCE_DIR}/regsyntax.c
25-
${CMAKE_CURRENT_SOURCE_DIR}/regtrav.c
26-
${CMAKE_CURRENT_SOURCE_DIR}/regversion.c
27-
${CMAKE_CURRENT_SOURCE_DIR}/st.c
28-
${CMAKE_CURRENT_SOURCE_DIR}/enc/ascii.c
29-
${CMAKE_CURRENT_SOURCE_DIR}/enc/big5.c
30-
${CMAKE_CURRENT_SOURCE_DIR}/enc/cp949.c
31-
${CMAKE_CURRENT_SOURCE_DIR}/enc/emacs_mule.c
32-
${CMAKE_CURRENT_SOURCE_DIR}/enc/euc_jp.c
33-
${CMAKE_CURRENT_SOURCE_DIR}/enc/euc_kr.c
34-
${CMAKE_CURRENT_SOURCE_DIR}/enc/euc_tw.c
35-
${CMAKE_CURRENT_SOURCE_DIR}/enc/gb18030.c
36-
${CMAKE_CURRENT_SOURCE_DIR}/enc/gbk.c
37-
${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859.h
38-
${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_1.c
39-
${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_10.c
40-
${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_11.c
41-
${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_13.c
42-
${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_14.c
43-
${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_15.c
44-
${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_16.c
45-
${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_2.c
46-
${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_3.c
47-
${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_4.c
48-
${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_5.c
49-
${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_6.c
50-
${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_7.c
51-
${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_8.c
52-
${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_9.c
53-
${CMAKE_CURRENT_SOURCE_DIR}/enc/koi8_r.c
54-
${CMAKE_CURRENT_SOURCE_DIR}/enc/koi8_u.c
55-
${CMAKE_CURRENT_SOURCE_DIR}/enc/shift_jis.c
56-
${CMAKE_CURRENT_SOURCE_DIR}/enc/unicode.c
57-
${CMAKE_CURRENT_SOURCE_DIR}/enc/us_ascii.c
58-
${CMAKE_CURRENT_SOURCE_DIR}/enc/utf_16be.c
59-
${CMAKE_CURRENT_SOURCE_DIR}/enc/utf_16le.c
60-
${CMAKE_CURRENT_SOURCE_DIR}/enc/utf_32be.c
61-
${CMAKE_CURRENT_SOURCE_DIR}/enc/utf_32le.c
62-
${CMAKE_CURRENT_SOURCE_DIR}/enc/utf_8.c
63-
${CMAKE_CURRENT_SOURCE_DIR}/enc/windows_1250.c
64-
${CMAKE_CURRENT_SOURCE_DIR}/enc/windows_1251.c
65-
${CMAKE_CURRENT_SOURCE_DIR}/enc/windows_1252.c
66-
${CMAKE_CURRENT_SOURCE_DIR}/enc/windows_1253.c
67-
${CMAKE_CURRENT_SOURCE_DIR}/enc/windows_1254.c
68-
${CMAKE_CURRENT_SOURCE_DIR}/enc/windows_1257.c
15+
${CMAKE_CURRENT_SOURCE_DIR}/regcomp.c
16+
${CMAKE_CURRENT_SOURCE_DIR}/regenc.c
17+
${CMAKE_CURRENT_SOURCE_DIR}/regerror.c
18+
${CMAKE_CURRENT_SOURCE_DIR}/regexec.c
19+
${CMAKE_CURRENT_SOURCE_DIR}/regext.c
20+
${CMAKE_CURRENT_SOURCE_DIR}/reggnu.c
21+
${CMAKE_CURRENT_SOURCE_DIR}/regparse.c
22+
${CMAKE_CURRENT_SOURCE_DIR}/regposerr.c
23+
${CMAKE_CURRENT_SOURCE_DIR}/regposix.c
24+
${CMAKE_CURRENT_SOURCE_DIR}/regsyntax.c
25+
${CMAKE_CURRENT_SOURCE_DIR}/regtrav.c
26+
${CMAKE_CURRENT_SOURCE_DIR}/regversion.c
27+
${CMAKE_CURRENT_SOURCE_DIR}/st.c
28+
${CMAKE_CURRENT_SOURCE_DIR}/enc/ascii.c
29+
${CMAKE_CURRENT_SOURCE_DIR}/enc/big5.c
30+
${CMAKE_CURRENT_SOURCE_DIR}/enc/cp949.c
31+
${CMAKE_CURRENT_SOURCE_DIR}/enc/emacs_mule.c
32+
${CMAKE_CURRENT_SOURCE_DIR}/enc/euc_jp.c
33+
${CMAKE_CURRENT_SOURCE_DIR}/enc/euc_kr.c
34+
${CMAKE_CURRENT_SOURCE_DIR}/enc/euc_tw.c
35+
${CMAKE_CURRENT_SOURCE_DIR}/enc/gb18030.c
36+
${CMAKE_CURRENT_SOURCE_DIR}/enc/gbk.c
37+
${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859.h
38+
${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_1.c
39+
${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_10.c
40+
${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_11.c
41+
${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_13.c
42+
${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_14.c
43+
${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_15.c
44+
${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_16.c
45+
${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_2.c
46+
${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_3.c
47+
${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_4.c
48+
${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_5.c
49+
${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_6.c
50+
${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_7.c
51+
${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_8.c
52+
${CMAKE_CURRENT_SOURCE_DIR}/enc/iso_8859_9.c
53+
${CMAKE_CURRENT_SOURCE_DIR}/enc/koi8_r.c
54+
${CMAKE_CURRENT_SOURCE_DIR}/enc/koi8_u.c
55+
${CMAKE_CURRENT_SOURCE_DIR}/enc/shift_jis.c
56+
${CMAKE_CURRENT_SOURCE_DIR}/enc/unicode.c
57+
${CMAKE_CURRENT_SOURCE_DIR}/enc/us_ascii.c
58+
${CMAKE_CURRENT_SOURCE_DIR}/enc/utf_16be.c
59+
${CMAKE_CURRENT_SOURCE_DIR}/enc/utf_16le.c
60+
${CMAKE_CURRENT_SOURCE_DIR}/enc/utf_32be.c
61+
${CMAKE_CURRENT_SOURCE_DIR}/enc/utf_32le.c
62+
${CMAKE_CURRENT_SOURCE_DIR}/enc/utf_8.c
63+
${CMAKE_CURRENT_SOURCE_DIR}/enc/windows_1250.c
64+
${CMAKE_CURRENT_SOURCE_DIR}/enc/windows_1251.c
65+
${CMAKE_CURRENT_SOURCE_DIR}/enc/windows_1252.c
66+
${CMAKE_CURRENT_SOURCE_DIR}/enc/windows_1253.c
67+
${CMAKE_CURRENT_SOURCE_DIR}/enc/windows_1254.c
68+
${CMAKE_CURRENT_SOURCE_DIR}/enc/windows_1257.c
6969
${CMAKE_CURRENT_SOURCE_DIR}/enc/windows_31j.c
7070
PARENT_SCOPE
7171
)
7272

7373
SET(ONIG_HEADERS
74-
${CMAKE_CURRENT_SOURCE_DIR}/config.h
75-
${CMAKE_CURRENT_SOURCE_DIR}/enc/unicode/casefold.h
76-
${CMAKE_CURRENT_SOURCE_DIR}/onigmo.h
77-
${CMAKE_CURRENT_SOURCE_DIR}/onigmognu.h
78-
${CMAKE_CURRENT_SOURCE_DIR}/onigmoposix.h
79-
${CMAKE_CURRENT_SOURCE_DIR}/regenc.h
80-
${CMAKE_CURRENT_SOURCE_DIR}/regint.h
81-
${CMAKE_CURRENT_SOURCE_DIR}/regparse.h
82-
${CMAKE_CURRENT_SOURCE_DIR}/st.h
83-
${CMAKE_CURRENT_SOURCE_DIR}/win32/config.h
74+
${CMAKE_CURRENT_SOURCE_DIR}/config.h
75+
${CMAKE_CURRENT_SOURCE_DIR}/enc/unicode/casefold.h
76+
${CMAKE_CURRENT_SOURCE_DIR}/onigmo.h
77+
${CMAKE_CURRENT_SOURCE_DIR}/onigmognu.h
78+
${CMAKE_CURRENT_SOURCE_DIR}/onigmoposix.h
79+
${CMAKE_CURRENT_SOURCE_DIR}/regenc.h
80+
${CMAKE_CURRENT_SOURCE_DIR}/regint.h
81+
${CMAKE_CURRENT_SOURCE_DIR}/regparse.h
82+
${CMAKE_CURRENT_SOURCE_DIR}/st.h
83+
${CMAKE_CURRENT_SOURCE_DIR}/win32/config.h
8484
${CMAKE_CURRENT_SOURCE_DIR}/config-onig-edbee.h
8585
PARENT_SCOPE
8686
)

‎vendor/qslog/CMakeLists.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# CMake build support courtesy of Axel Gembe <axel@gembe.net>
2-
cmake_minimum_required(VERSION 2.8)
1+
CMAKE_MINIMUM_REQUIRED(VERSION 3.1...3.20)
32

43
project(QsLog)
54

0 commit comments

Comments
 (0)