# HG changeset patch # User Sebastien Jodogne # Date 1679900556 -7200 # Node ID fb96f1ffd0204c7d48f0c04c15e8372e8015011a # Parent c0f6c6fe1c47f19d6d3b893e408258e89fa8cbfd fix diff -r c0f6c6fe1c47 -r fb96f1ffd020 OrthancFramework/Resources/CMake/ProtobufConfiguration.cmake --- a/OrthancFramework/Resources/CMake/ProtobufConfiguration.cmake Mon Mar 27 07:44:50 2023 +0200 +++ b/OrthancFramework/Resources/CMake/ProtobufConfiguration.cmake Mon Mar 27 09:02:36 2023 +0200 @@ -30,7 +30,7 @@ CMAKE_ARGS -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR} - INSTALL_COMMAND "" + INSTALL_COMMAND "" # Skip the install step ) # The "protoc" compiler is built using "externalproject_add", @@ -40,8 +40,9 @@ else() set(Suffix "") endif() - - set(PROTOC_EXECUTABLE ${CMAKE_CURRENT_BINARY_DIR}/ProtobufCompiler-build/protoc${Suffix}) + + externalproject_get_property(ProtobufCompiler binary_dir) + set(PROTOC_EXECUTABLE ${binary_dir}/protoc${Suffix}) endif() include(${CMAKE_CURRENT_LIST_DIR}/../ProtocolBuffers/ProtobufLibrary.cmake) diff -r c0f6c6fe1c47 -r fb96f1ffd020 OrthancServer/Sources/Database/IDatabaseWrapper.h --- a/OrthancServer/Sources/Database/IDatabaseWrapper.h Mon Mar 27 07:44:50 2023 +0200 +++ b/OrthancServer/Sources/Database/IDatabaseWrapper.h Mon Mar 27 09:02:36 2023 +0200 @@ -42,7 +42,7 @@ class IDatabaseWrapper : public boost::noncopyable { public: - struct CreateInstanceResult + struct CreateInstanceResult : public boost::noncopyable { bool isNewPatient_; bool isNewStudy_;