Mercurial > hg > orthanc-stone
changeset 1426:1e132fe7090e
fix dynamic linking
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 15 May 2020 13:04:34 +0200 |
| parents | 95674f9c169a |
| children | cecedf0b1be6 |
| files | Framework/Loaders/GenericLoadersContext.cpp Framework/Loaders/GenericLoadersContext.h Samples/Sdl/CMakeLists.txt Samples/Sdl/SingleFrameViewer/SdlSimpleViewer.cpp |
| diffstat | 4 files changed, 5 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/Framework/Loaders/GenericLoadersContext.cpp Fri May 15 12:28:51 2020 +0200 +++ b/Framework/Loaders/GenericLoadersContext.cpp Fri May 15 13:04:34 2020 +0200 @@ -73,7 +73,7 @@ } virtual void GetStatistics(uint64_t& scheduledCommands, - uint64_t& processedCommands) + uint64_t& processedCommands) ORTHANC_OVERRIDE { scheduledCommands = that_.scheduler_->GetTotalScheduled(); processedCommands = that_.scheduler_->GetTotalProcessed();
--- a/Framework/Loaders/GenericLoadersContext.h Fri May 15 12:28:51 2020 +0200 +++ b/Framework/Loaders/GenericLoadersContext.h Fri May 15 13:04:34 2020 +0200 @@ -52,7 +52,7 @@ std::list< boost::shared_ptr<IObserver> > loaders_; virtual void EmitMessage(boost::weak_ptr<IObserver> observer, - const IMessage& message); + const IMessage& message) ORTHANC_OVERRIDE; public: GenericLoadersContext(unsigned int maxHighPriority,
--- a/Samples/Sdl/CMakeLists.txt Fri May 15 12:28:51 2020 +0200 +++ b/Samples/Sdl/CMakeLists.txt Fri May 15 13:04:34 2020 +0200 @@ -65,7 +65,7 @@ ../Common/SampleHelpers.h ) -target_link_libraries(RtViewerSdl ${DCMTK_LIBRARIES} OrthancStone) +target_link_libraries(RtViewerSdl OrthancStone ${DCMTK_LIBRARIES}) ############################# project(SdlSimpleViewer) @@ -78,7 +78,7 @@ ${BOOST_EXTENDED_SOURCES} ) -target_link_libraries(SdlSimpleViewer ${DCMTK_LIBRARIES} OrthancStone) +target_link_libraries(SdlSimpleViewer OrthancStone ${DCMTK_LIBRARIES}) ############################# project(UnitTests) @@ -105,4 +105,4 @@ "$<TARGET_FILE_DIR:UnitTests>/72c773ac-5059f2c4-2e6a9120-4fd4bca1-45701661.json" ) -target_link_libraries(UnitTests ${DCMTK_LIBRARIES} OrthancStone) +target_link_libraries(UnitTests OrthancStone ${DCMTK_LIBRARIES})
--- a/Samples/Sdl/SingleFrameViewer/SdlSimpleViewer.cpp Fri May 15 12:28:51 2020 +0200 +++ b/Samples/Sdl/SingleFrameViewer/SdlSimpleViewer.cpp Fri May 15 13:04:34 2020 +0200 @@ -231,8 +231,6 @@ } catch (Orthanc::OrthancException& e) { - auto test = e.What(); - fprintf(stdout, test); LOG(ERROR) << "OrthancException: " << e.What(); return -1; }