Merge pull request #5133

f0fc4064 Various speedups to depends and Travis (TheCharlatan)
This commit is contained in:
Riccardo Spagni 2019-03-04 21:28:56 +02:00
commit 933c701c6e
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
11 changed files with 17 additions and 326 deletions

View file

@ -900,7 +900,7 @@ if(MINGW)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wa,-mbig-obj")
set(EXTRA_LIBRARIES mswsock;ws2_32;iphlpapi;crypt32;bcrypt)
if(DEPENDS)
set(ICU_LIBRARIES sicuio sicuin sicuuc sicudt sicutu iconv)
set(ICU_LIBRARIES icuio icui18n icuuc icudata icutu iconv)
else()
set(ICU_LIBRARIES icuio icuin icuuc icudt icutu iconv)
endif()