1
- From 5ffc30f0afb6718ee347f4aa4ac46097547c041f Mon Sep 17 00:00:00 2001
1
+ From 5c04c91d4941c422abeea20863f01146afa2f4e1 Mon Sep 17 00:00:00 2001
2
2
From: foopoiuyt <github@zombiestormtrooper.com>
3
3
Date: Tue, 3 Nov 2020 08:58:19 -0800
4
4
Subject: [PATCH 1/2] Add CMake platform
@@ -15,7 +15,7 @@ Modified version of the LibCMaker ICU files.
15
15
source/common_tools_exe_flags.cmake | 86 +
16
16
source/common_tools_exe_libs.cmake | 8 +
17
17
source/configure_1st.cmake | 137 +
18
- source/configure_2nd.cmake | 1208 +++
18
+ source/configure_2nd.cmake | 1189 +++
19
19
source/data/CMakeLists.txt | 340 +
20
20
.../data/cmake-brkitr-index-txt-content.in | 21 +
21
21
.../data/cmake-coll-index-txt-content.in | 168 +
@@ -56,7 +56,7 @@ Modified version of the LibCMaker ICU files.
56
56
source/tools/makeconv/CMakeLists.txt | 31 +
57
57
source/tools/pkgdata/CMakeLists.txt | 35 +
58
58
source/tools/toolutil/CMakeLists.txt | 59 +
59
- 51 files changed, 20144 insertions(+)
59
+ 51 files changed, 20125 insertions(+)
60
60
create mode 100644 LICENSE_CMakeLists
61
61
create mode 100644 README_CMakeLists.txt
62
62
create mode 100644 source/CMakeLists.txt
@@ -1143,10 +1143,10 @@ index 00000000000..dd22f884c3a
1143
1143
+ status_message("release ${VERSION}, library ${LIB_VERSION}, unicode version ${UNICODE_VERSION}")
1144
1144
diff --git a/source/configure_2nd.cmake b/source/configure_2nd.cmake
1145
1145
new file mode 100644
1146
- index 00000000000..be373fbc3c3
1146
+ index 00000000000..637c17e4bd3
1147
1147
--- /dev/null
1148
1148
+++ b/source/configure_2nd.cmake
1149
- @@ -0,0 +1,1208 @@
1149
+ @@ -0,0 +1,1189 @@
1150
1150
+ # Copyright (c) 2018, NikitaFeodonit. All rights reserved.
1151
1151
+ #
1152
1152
+ # ICU build file for CMake build tools
@@ -1268,7 +1268,7 @@ index 00000000000..be373fbc3c3
1268
1268
+
1269
1269
+ set(CMAKE_C_STANDARD 99)
1270
1270
+ set(CMAKE_C_STANDARD_REQUIRED ON)
1271
- + set(CMAKE_CXX_STANDARD 11 )
1271
+ + set(CMAKE_CXX_STANDARD 17 )
1272
1272
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
1273
1273
+
1274
1274
+ # Check whether to build debug libraries check_message("whether to build debug libraries"
@@ -1549,25 +1549,6 @@ index 00000000000..be373fbc3c3
1549
1549
+ # Check whether to use the evil rpath or not
1550
1550
+ option(ICU_ENABLE_RPATH "Use rpath when linking" OFF)
1551
1551
+
1552
- + if(CMAKE_CXX_STANDARD LESS 11)
1553
- + try_compile_src(
1554
- + "if_include_string_works"
1555
- + "cpp"
1556
- + "#include <string>"
1557
- + ""
1558
- + ""
1559
- + ""
1560
- + _HEADER_STDSTRING
1561
- + )
1562
- + if(_HEADER_STDSTRING)
1563
- + set(U_HAVE_STD_STRING 1)
1564
- + else()
1565
- + set(U_HAVE_STD_STRING 0)
1566
- + list(APPEND CONFIG_CPPFLAGS U_HAVE_STD_STRING=0)
1567
- + endif()
1568
- + check_message("if #include <string> works" ${_HEADER_STDSTRING})
1569
- + endif()
1570
- +
1571
1552
+ # NOTE: this check is removed in ICU 63.1, C++11 has <atomic>.
1572
1553
+ try_compile_src(
1573
1554
+ "if_include_atomic_works"
@@ -20560,5 +20541,5 @@ index 00000000000..36b15d4783d
20560
20541
+ DESTINATION "${includedir}"
20561
20542
+ )
20562
20543
- -
20563
- 2.43 .0.windows.1
20544
+ 2.44 .0.windows.1
20564
20545
0 commit comments