comparison Resources/CMake/BoostConfiguration.cmake @ 3241:32596919d729

first compilation combining ICU and LSB
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 16 Feb 2019 00:31:35 +0100
parents 4b042ec734c1
children e8ce77f3dec1
comparison
equal deleted inserted replaced
3240:e44e0127e553 3241:32596919d729
269 ${BOOST_SOURCES_DIR}/libs/locale/src/std/converter.cpp 269 ${BOOST_SOURCES_DIR}/libs/locale/src/std/converter.cpp
270 ${BOOST_SOURCES_DIR}/libs/locale/src/std/numeric.cpp 270 ${BOOST_SOURCES_DIR}/libs/locale/src/std/numeric.cpp
271 ${BOOST_SOURCES_DIR}/libs/locale/src/std/std_backend.cpp 271 ${BOOST_SOURCES_DIR}/libs/locale/src/std/std_backend.cpp
272 ) 272 )
273 273
274 if (BOOST_LOCALE_BACKEND STREQUAL "iconv") 274 if (BOOST_LOCALE_BACKEND STREQUAL "gcc" OR
275 BOOST_LOCALE_BACKEND STREQUAL "libiconv")
275 add_definitions(-DBOOST_LOCALE_WITH_ICONV=1) 276 add_definitions(-DBOOST_LOCALE_WITH_ICONV=1)
276 elseif (BOOST_LOCALE_BACKEND STREQUAL "icu") 277 elseif (BOOST_LOCALE_BACKEND STREQUAL "icu")
277 add_definitions(-DBOOST_LOCALE_WITH_ICU=1) 278 add_definitions(-DBOOST_LOCALE_WITH_ICU=1)
278 list(APPEND BOOST_SOURCES ${BOOST_ICU_SOURCES}) 279 list(APPEND BOOST_SOURCES ${BOOST_ICU_SOURCES})
279 else() 280 else()
300 ${BOOST_SOURCES_DIR}/libs/locale/src/posix/numeric.cpp 301 ${BOOST_SOURCES_DIR}/libs/locale/src/posix/numeric.cpp
301 ${BOOST_SOURCES_DIR}/libs/locale/src/posix/posix_backend.cpp 302 ${BOOST_SOURCES_DIR}/libs/locale/src/posix/posix_backend.cpp
302 ) 303 )
303 304
304 if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten" OR 305 if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten" OR
305 BOOST_LOCALE_BACKEND STREQUAL "iconv") 306 BOOST_LOCALE_BACKEND STREQUAL "gcc" OR
307 BOOST_LOCALE_BACKEND STREQUAL "libiconv")
306 # In WebAssembly or asm.js, we rely on the version of iconv 308 # In WebAssembly or asm.js, we rely on the version of iconv
307 # that is shipped with the stdlib 309 # that is shipped with the stdlib
308 add_definitions(-DBOOST_LOCALE_WITH_ICONV=1) 310 add_definitions(-DBOOST_LOCALE_WITH_ICONV=1)
309 elseif (BOOST_LOCALE_BACKEND STREQUAL "icu") 311 elseif (BOOST_LOCALE_BACKEND STREQUAL "icu")
310 add_definitions(-DBOOST_LOCALE_WITH_ICU=1) 312 add_definitions(-DBOOST_LOCALE_WITH_ICU=1)
326 ${BOOST_SOURCES_DIR}/libs/locale/src/win32/numeric.cpp 328 ${BOOST_SOURCES_DIR}/libs/locale/src/win32/numeric.cpp
327 ${BOOST_SOURCES_DIR}/libs/locale/src/win32/win_backend.cpp 329 ${BOOST_SOURCES_DIR}/libs/locale/src/win32/win_backend.cpp
328 ) 330 )
329 331
330 # Starting with release 0.8.2, Orthanc statically links against 332 # Starting with release 0.8.2, Orthanc statically links against
331 # libiconv, even on Windows. Indeed, the "WCONV" library of 333 # libiconv on Windows. Indeed, the "WCONV" library of Windows XP
332 # Windows XP seems not to support properly several codepages 334 # seems not to support properly several codepages (notably
333 # (notably "Latin3", "Hebrew", and "Arabic"). Set 335 # "Latin3", "Hebrew", and "Arabic"). Set "BOOST_LOCALE_BACKEND"
334 # "BOOST_LOCALE_BACKEND" to "wconv" to use WCONV anyway. 336 # to "wconv" to use WCONV anyway.
335 337
336 if (BOOST_LOCALE_BACKEND STREQUAL "iconv") 338 if (BOOST_LOCALE_BACKEND STREQUAL "libiconv")
337 add_definitions(-DBOOST_LOCALE_WITH_ICONV=1) 339 add_definitions(-DBOOST_LOCALE_WITH_ICONV=1)
338 elseif (BOOST_LOCALE_BACKEND STREQUAL "icu") 340 elseif (BOOST_LOCALE_BACKEND STREQUAL "icu")
339 add_definitions(-DBOOST_LOCALE_WITH_ICU=1) 341 add_definitions(-DBOOST_LOCALE_WITH_ICU=1)
340 list(APPEND BOOST_SOURCES ${BOOST_ICU_SOURCES}) 342 list(APPEND BOOST_SOURCES ${BOOST_ICU_SOURCES})
341 elseif (BOOST_LOCALE_BACKEND STREQUAL "wconv") 343 elseif (BOOST_LOCALE_BACKEND STREQUAL "wconv")
342 message("Using Window's wconv") 344 message("Using Window's wconv")
345 add_definitions(-DBOOST_LOCALE_WITH_WCONV=1)
343 else() 346 else()
344 add_definitions(-DBOOST_LOCALE_WITH_WCONV=1) 347 message(FATAL_ERROR "Unsupported value for BOOST_LOCALE_BACKEND on Windows: ${BOOST_LOCALE_BACKEND}")
345 endif() 348 endif()
346 349
347 else() 350 else()
348 message(FATAL_ERROR "Support your platform here") 351 message(FATAL_ERROR "Support your platform here")
349 endif() 352 endif()