changeset 5191:fb96f1ffd020 db-protobuf

fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 27 Mar 2023 09:02:36 +0200
parents c0f6c6fe1c47
children af66a8e93ccf
files OrthancFramework/Resources/CMake/ProtobufConfiguration.cmake OrthancServer/Sources/Database/IDatabaseWrapper.h
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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)  
--- 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_;