changeset 3243:cf0ad1fb2bb7

trying a fix for windows
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 16 Feb 2019 09:47:36 +0100
parents 5d78df37c62f
children 6f35279215c4
files Resources/ThirdParty/icu/CMakeLists.txt Resources/ThirdParty/icu/README.txt Resources/ThirdParty/icu/Version.cmake
diffstat 3 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Resources/ThirdParty/icu/CMakeLists.txt	Sat Feb 16 09:17:50 2019 +0100
+++ b/Resources/ThirdParty/icu/CMakeLists.txt	Sat Feb 16 09:47:36 2019 +0100
@@ -60,9 +60,11 @@
 
 message(${LIBICU_DATA}.gz)
 
+
+# "--no-name" is necessary for 7-zip on Windows to behave similarly to gunzip
 add_custom_command(
   OUTPUT   ${CMAKE_BINARY_DIR}/${LIBICU_DATA}.gz
-  COMMAND  gzip ${CMAKE_BINARY_DIR}/${LIBICU_DATA_VERSION}_dat.c -c > ${CMAKE_BINARY_DIR}/${LIBICU_DATA}.gz
+  COMMAND  gzip ${CMAKE_BINARY_DIR}/${LIBICU_DATA_VERSION}_dat.c --no-name -c > ${CMAKE_BINARY_DIR}/${LIBICU_DATA}.gz
   DEPENDS  ${LIBICU_DATA}
   )
 
--- a/Resources/ThirdParty/icu/README.txt	Sat Feb 16 09:17:50 2019 +0100
+++ b/Resources/ThirdParty/icu/README.txt	Sat Feb 16 09:47:36 2019 +0100
@@ -10,7 +10,6 @@
 not use C++11 (58-2).
 
 
-
 Usage
 -----
 
--- a/Resources/ThirdParty/icu/Version.cmake	Sat Feb 16 09:17:50 2019 +0100
+++ b/Resources/ThirdParty/icu/Version.cmake	Sat Feb 16 09:47:36 2019 +0100
@@ -19,12 +19,12 @@
   set(LIBICU_URL "${LIBICU_BASE_URL}/icu4c-58_2-src.tgz")
   set(LIBICU_MD5 "fac212b32b7ec7ab007a12dff1f3aea1")
   set(LIBICU_DATA_VERSION "icudt58")
-  set(LIBICU_DATA_MD5 "7761ce2c00d2dda5800f375f878c4a88")
+  set(LIBICU_DATA_MD5 "ce2c7791ab637898553c121633155fb6")
 else()
   set(LIBICU_URL "${LIBICU_BASE_URL}/icu4c-63_1-src.tgz")
   set(LIBICU_MD5 "9e40f6055294284df958200e308bce50")
   set(LIBICU_DATA_VERSION "icudt63")
-  set(LIBICU_DATA_MD5 "dc2f015e886f53e19cec3a44b971afba")
+  set(LIBICU_DATA_MD5 "92b5c73a1accd8ecf8c20c89bc6925a9")
 endif()
 
 set(LIBICU_SOURCES_DIR ${CMAKE_BINARY_DIR}/icu)