Mercurial > hg > orthanc
changeset 2018:300599489cab
USE_BOOST_LOCALE_BACKENDS
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 14 Jun 2016 15:51:00 +0200 |
parents | 08ce34cfacad |
children | 9c9332e486ca |
files | OrthancServer/main.cpp Resources/CMake/BoostConfiguration.cmake |
diffstat | 2 files changed, 60 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/OrthancServer/main.cpp Mon Jun 13 15:49:10 2016 +0200 +++ b/OrthancServer/main.cpp Tue Jun 14 15:51:00 2016 +0200 @@ -33,7 +33,6 @@ #include "PrecompiledHeadersServer.h" #include "OrthancRestApi/OrthancRestApi.h" -#include <fstream> #include <boost/algorithm/string/predicate.hpp> #include "../Core/Logging.h" @@ -1113,6 +1112,8 @@ { // Use the first argument that does not start with a "-" as // the configuration file + + // TODO WHAT IS THE ENCODING? configurationFile = argv[i]; } } @@ -1141,6 +1142,7 @@ } else if (boost::starts_with(argument, "--logdir=")) { + // TODO WHAT IS THE ENCODING? std::string directory = argument.substr(9); try @@ -1156,6 +1158,7 @@ } else if (boost::starts_with(argument, "--logfile=")) { + // TODO WHAT IS THE ENCODING? std::string file = argument.substr(10); try @@ -1175,6 +1178,7 @@ } else if (boost::starts_with(argument, "--config=")) { + // TODO WHAT IS THE ENCODING? std::string configurationSample; GetFileResource(configurationSample, EmbeddedResources::CONFIGURATION_SAMPLE);
--- a/Resources/CMake/BoostConfiguration.cmake Mon Jun 13 15:49:10 2016 +0200 +++ b/Resources/CMake/BoostConfiguration.cmake Tue Jun 14 15:51:00 2016 +0200 @@ -61,6 +61,8 @@ ) add_definitions( -DBOOST_LOCALE_WITH_ICONV=1 + -DBOOST_LOCALE_NO_WINAPI_BACKEND=1 + -DBOOST_LOCALE_NO_STD_BACKEND=1 ) if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase") @@ -86,6 +88,10 @@ add_definitions(-DBOOST_LOCALE_WITH_WCONV=1) endif() + add_definitions( + -DBOOST_LOCALE_NO_POSIX_BACKEND=1 + -DBOOST_LOCALE_NO_STD_BACKEND=1 + ) else() message(FATAL_ERROR "Support your platform here") endif() @@ -109,6 +115,55 @@ ${BOOST_SOURCES_DIR}/libs/system/src/error_code.cpp ) + if (USE_BOOST_LOCALE_BACKENDS) + if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR + ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" OR + ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" OR + ${CMAKE_SYSTEM_NAME} STREQUAL "kFreeBSD") + list(APPEND BOOST_SOURCES + ${BOOST_SOURCES_DIR}/libs/locale/src/posix/codecvt.cpp + ${BOOST_SOURCES_DIR}/libs/locale/src/posix/collate.cpp + ${BOOST_SOURCES_DIR}/libs/locale/src/posix/converter.cpp + ${BOOST_SOURCES_DIR}/libs/locale/src/posix/numeric.cpp + ${BOOST_SOURCES_DIR}/libs/locale/src/posix/posix_backend.cpp + ) + elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") + list(APPEND BOOST_SOURCES + ${BOOST_SOURCES_DIR}/libs/locale/src/win32/collate.cpp + ${BOOST_SOURCES_DIR}/libs/locale/src/win32/converter.cpp + ${BOOST_SOURCES_DIR}/libs/locale/src/win32/lcid.cpp + ${BOOST_SOURCES_DIR}/libs/locale/src/win32/numeric.cpp + ${BOOST_SOURCES_DIR}/libs/locale/src/win32/win_backend.cpp + ) + else() + message(FATAL_ERROR "Support your platform here") + endif() + + list(APPEND BOOST_SOURCES + ${BOOST_REGEX_SOURCES} + ${BOOST_SOURCES_DIR}/libs/date_time/src/gregorian/greg_month.cpp + ${BOOST_SOURCES_DIR}/libs/system/src/error_code.cpp + + ${BOOST_FILESYSTEM_SOURCES_DIR}/codecvt_error_category.cpp + ${BOOST_FILESYSTEM_SOURCES_DIR}/operations.cpp + ${BOOST_FILESYSTEM_SOURCES_DIR}/path.cpp + ${BOOST_FILESYSTEM_SOURCES_DIR}/path_traits.cpp + + ${BOOST_SOURCES_DIR}/libs/locale/src/shared/generator.cpp + ${BOOST_SOURCES_DIR}/libs/locale/src/shared/date_time.cpp + ${BOOST_SOURCES_DIR}/libs/locale/src/shared/formatting.cpp + ${BOOST_SOURCES_DIR}/libs/locale/src/shared/ids.cpp + ${BOOST_SOURCES_DIR}/libs/locale/src/shared/localization_backend.cpp + ${BOOST_SOURCES_DIR}/libs/locale/src/shared/message.cpp + ${BOOST_SOURCES_DIR}/libs/locale/src/shared/mo_lambda.cpp + ${BOOST_SOURCES_DIR}/libs/locale/src/util/codecvt_converter.cpp + ${BOOST_SOURCES_DIR}/libs/locale/src/util/default_locale.cpp + ${BOOST_SOURCES_DIR}/libs/locale/src/util/gregorian.cpp + ${BOOST_SOURCES_DIR}/libs/locale/src/util/info.cpp + ${BOOST_SOURCES_DIR}/libs/locale/src/util/locale_data.cpp + ) + endif() + add_definitions( # Static build of Boost -DBOOST_ALL_NO_LIB