Mercurial > hg > orthanc
changeset 6359:382f8665dbe0
pthread_setname_np() is not available on linux standard base
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 29 Oct 2025 22:37:47 +0100 |
| parents | aa4558c0529e |
| children | 58c09dbf73e7 |
| files | OrthancFramework/Sources/Logging.cpp OrthancServer/Plugins/Samples/ModalityWorklists/CMakeLists.txt |
| diffstat | 2 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/OrthancFramework/Sources/Logging.cpp Wed Oct 29 22:20:23 2025 +0100 +++ b/OrthancFramework/Sources/Logging.cpp Wed Oct 29 22:37:47 2025 +0100 @@ -31,8 +31,8 @@ #include <stdint.h> #if defined(__linux__) && !defined(NDEBUG) - #include <pthread.h> -#endif +# include <pthread.h> +#endif /********************************************************* @@ -663,7 +663,7 @@ threadNames_[id] = name; -#if defined(__linux__) && !defined(NDEBUG) +#if defined(__linux__) && !defined(NDEBUG) && !defined(__LSB_VERSION__) // set the thread name at "system" level too -> required to have the thread names visible in GDB ! pthread_setname_np(pthread_self(), name.substr(0, 15).c_str()); // thread names are limited to 15 in Linux #endif
--- a/OrthancServer/Plugins/Samples/ModalityWorklists/CMakeLists.txt Wed Oct 29 22:20:23 2025 +0100 +++ b/OrthancServer/Plugins/Samples/ModalityWorklists/CMakeLists.txt Wed Oct 29 22:37:47 2025 +0100 @@ -30,7 +30,9 @@ include(${CMAKE_SOURCE_DIR}/../Common/OrthancPlugins.cmake) include(${CMAKE_SOURCE_DIR}/../../../../OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake) - +set(ENABLE_JPEG ON CACHE INTERNAL "") +set(ENABLE_PNG ON CACHE INTERNAL "") +set(ENABLE_ZLIB ON CACHE INTERNAL "") set(ENABLE_LOCALE ON CACHE INTERNAL "") set(ENABLE_DCMTK ON CACHE INTERNAL "") set(ENABLE_MODULE_DICOM ON CACHE INTERNAL "") @@ -38,13 +40,9 @@ include(${CMAKE_SOURCE_DIR}/../../../../OrthancFramework/Resources/CMake/OrthancFrameworkConfiguration.cmake) - add_library(ModalityWorklists SHARED Plugin.cpp - OrthancFrameworkDependencies.cpp - ${CMAKE_SOURCE_DIR}/../Common/OrthancPluginCppWrapper.cpp - ${ORTHANC_CORE_SOURCES} ${ORTHANC_DICOM_SOURCES} ${AUTOGENERATED_SOURCES} @@ -52,6 +50,8 @@ DefineSourceBasenameForTarget(ModalityWorklists) +target_link_libraries(ModalityWorklists ${DCMTK_LIBRARIES}) + message("Setting the version of the plugin to ${MODALITY_WORKLISTS_VERSION}") add_definitions( -DMODALITY_WORKLISTS_VERSION="${MODALITY_WORKLISTS_VERSION}"
