Mercurial > hg > orthanc
changeset 3269:905ee53c8274
cont
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 20 Feb 2019 14:56:59 +0100 |
| parents | 138b94c2775c |
| children | 92d679112657 |
| files | Resources/ThirdParty/icu/CMakeLists.txt Resources/ThirdParty/icu/README.txt Resources/ThirdParty/icu/Version.cmake |
| diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Resources/ThirdParty/icu/CMakeLists.txt Wed Feb 20 14:44:16 2019 +0100 +++ b/Resources/ThirdParty/icu/CMakeLists.txt Wed Feb 20 14:56:59 2019 +0100 @@ -70,8 +70,8 @@ # Generate a precompiled version for Visual Studio 64bit set(TMP_ASSEMBLER ${CMAKE_BINARY_DIR}/${LIBICU_DATA_VERSION}_dat.S) set(TMP_OBJECT ${CMAKE_BINARY_DIR}/${LIBICU_DATA_VERSION}_dat-x86_64-mingw32.o) - set(TMP_LIBRARY ${CMAKE_BINARY_DIR}/${LIBICU_DATA_VERSION}_dat-x86_64-mingw32.a) - set(PRECOMPILED_WIN64 ${CMAKE_BINARY_DIR}/${LIBICU_DATA_VERSION}_dat-x86_64-mingw32.a.gz) + set(TMP_LIBRARY ${CMAKE_BINARY_DIR}/${LIBICU_DATA_VERSION}_dat-x86_64-mingw32.lib) + set(PRECOMPILED_WIN64 ${CMAKE_BINARY_DIR}/${LIBICU_DATA_VERSION}_dat-x86_64-mingw32.lib.gz) add_custom_command( OUTPUT ${TMP_ASSEMBLER}
--- a/Resources/ThirdParty/icu/README.txt Wed Feb 20 14:44:16 2019 +0100 +++ b/Resources/ThirdParty/icu/README.txt Wed Feb 20 14:56:59 2019 +0100 @@ -17,7 +17,7 @@ $ cmake .. -G Ninja && ninja install -Legacy version for LSB: +Legacy version suitable for LSB: $ cmake .. -G Ninja -DUSE_LEGACY_LIBICU=ON && ninja install
--- a/Resources/ThirdParty/icu/Version.cmake Wed Feb 20 14:44:16 2019 +0100 +++ b/Resources/ThirdParty/icu/Version.cmake Wed Feb 20 14:56:59 2019 +0100 @@ -33,5 +33,5 @@ set(LIBICU_DATA "${LIBICU_DATA_VERSION}${LIBICU_SUFFIX}_dat.c") set(LIBICU_DATA_URL "${LIBICU_BASE_URL}/${LIBICU_DATA}.gz") -set(LIBICU_DATA_WIN64 "${LIBICU_DATA_VERSION}_dat-x86_64-mingw32.a") +set(LIBICU_DATA_WIN64 "${LIBICU_DATA_VERSION}_dat-x86_64-mingw32.lib") set(LIBICU_DATA_WIN64_URL "${LIBICU_BASE_URL}/${LIBICU_DATA_WIN64}.gz")