Mercurial > hg > orthanc
changeset 4431:b7f27b116685
cont
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 04 Jan 2021 14:34:44 +0100 |
| parents | f5d44e30b429 |
| children | fcbac3e8ac1c |
| files | OrthancFramework/Resources/CMake/DcmtkConfiguration.cmake OrthancFramework/SharedLibrary/CMakeLists.txt OrthancFramework/SharedLibrary/NOTES.txt |
| diffstat | 3 files changed, 16 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/OrthancFramework/Resources/CMake/DcmtkConfiguration.cmake Mon Jan 04 12:42:45 2021 +0100 +++ b/OrthancFramework/Resources/CMake/DcmtkConfiguration.cmake Mon Jan 04 14:34:44 2021 +0100 @@ -134,8 +134,6 @@ # New in Orthanc 1.9.0 for DICOM TLS if (ENABLE_DCMTK_NETWORKING AND ENABLE_SSL) - # Must be the last command to add files to ${DCMTK_SOURCES}, - # because of "PROPERTIES COMPILE_DEFINITIONS" AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmtls/libsrc DCMTK_SOURCES) include_directories( ${DCMTK_SOURCES_DIR}/dcmtls/include @@ -154,8 +152,7 @@ if (HAVE_SSL_CTX_GET0_PARAM) message("Have SSL_CTX_get0_param(): yes") - set_source_files_properties(${DCMTK_SOURCES} - PROPERTIES COMPILE_DEFINITIONS "HAVE_SSL_CTX_GET0_PARAM") + add_definitions(-DHAVE_SSL_CTX_GET0_PARAM=1) else() message("Have SSL_CTX_get0_param(): no") endif()
--- a/OrthancFramework/SharedLibrary/CMakeLists.txt Mon Jan 04 12:42:45 2021 +0100 +++ b/OrthancFramework/SharedLibrary/CMakeLists.txt Mon Jan 04 14:34:44 2021 +0100 @@ -98,6 +98,10 @@ set(ENABLE_WEB_SERVER ON) set(BOOST_LOCALE_BACKEND "icu") + if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase") + set(USE_LEGACY_JSONCPP ON) + set(USE_LEGACY_LIBICU ON) + endif() endif()
--- a/OrthancFramework/SharedLibrary/NOTES.txt Mon Jan 04 12:42:45 2021 +0100 +++ b/OrthancFramework/SharedLibrary/NOTES.txt Mon Jan 04 14:34:44 2021 +0100 @@ -26,6 +26,17 @@ +Linux Standard Base +=================== + +$ cd lsb +$ LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake /home/jodogne/Subversion/orthanc/OrthancFramework/SharedLibrary -G Ninja \ + -DCMAKE_TOOLCHAIN_FILE=/home/jodogne/Subversion/orthanc/OrthancFramework/Resources/Toolchains/LinuxStandardBaseToolchain.cmake \ + -DCMAKE_BUILD_TYPE=Release -DSTATIC_BUILD=ON +$ ninja -j4 + + + Cross-compilation to Windows 32 (using MinGW) ===============================