From 48fde49a42e3d9520ab089dea1b58feaa7db60a2 Mon Sep 17 00:00:00 2001 From: Canming Huang Date: Mon, 30 Sep 2024 15:52:07 -0400 Subject: [PATCH] Add Emgu.runtime.windows.msvc.rt nuget packages before Emgu.CV.TF(.Lite).runtime.windows nuget package project. --- platforms/nuget/CMakeLists.txt | 15 ++++++++------- .../Emgu.TF.Lite.runtime.windows/CMakeLists.txt | 9 +++++++++ .../nuget/Emgu.TF.runtime.windows/CMakeLists.txt | 4 ++++ 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/platforms/nuget/CMakeLists.txt b/platforms/nuget/CMakeLists.txt index 759a02ef..54bd621d 100644 --- a/platforms/nuget/CMakeLists.txt +++ b/platforms/nuget/CMakeLists.txt @@ -6,6 +6,14 @@ #add_subdirectory(Emgu.TF.Models) #add_subdirectory(Emgu.TF.Protobuf) +IF (HAVE_WINDESKTOP_X64_LITE OR HAVE_WINDESKTOP) + ADD_SUBDIRECTORY(Emgu.runtime.windows.msvc.rt.x64) +ENDIF() + +IF (HAVE_WINDESKTOP_X86_LITE) + ADD_SUBDIRECTORY(Emgu.runtime.windows.msvc.rt.x86) +ENDIF() + IF (WIN32 AND HAVE_WINDESKTOP) add_subdirectory(Emgu.runtime.windows.zlibwapi.x64) @@ -53,13 +61,6 @@ IF (HAVE_WINDESKTOP_LITE) add_subdirectory(Emgu.TF.Lite.runtime.windows) ENDIF() -IF (HAVE_WINDESKTOP_X64_LITE OR HAVE_WINDESKTOP) - ADD_SUBDIRECTORY(Emgu.runtime.windows.msvc.rt.x64) -ENDIF() - -IF (HAVE_WINDESKTOP_X86_LITE) - ADD_SUBDIRECTORY(Emgu.runtime.windows.msvc.rt.x86) -ENDIF() IF(HAVE_OSX_LITE) add_subdirectory(Emgu.TF.Lite.runtime.macos) diff --git a/platforms/nuget/Emgu.TF.Lite.runtime.windows/CMakeLists.txt b/platforms/nuget/Emgu.TF.Lite.runtime.windows/CMakeLists.txt index edc0724c..a0cb775f 100644 --- a/platforms/nuget/Emgu.TF.Lite.runtime.windows/CMakeLists.txt +++ b/platforms/nuget/Emgu.TF.Lite.runtime.windows/CMakeLists.txt @@ -18,6 +18,15 @@ PROJECT(Emgu.TF.Lite.runtime.windows.nuget) IF (EMGU_NUGET_SIGN_FOUND) EMGU_SIGN_NUGET(${PROJECT_NAME} "${NUGET_OUTPUT_DIR}/${EMGUTF_LITE_WINDOWS_NUGET_ID}.${CPACK_PACKAGE_VERSION}${TENSORFLOW_VERSION_SUFFIX}.nupkg") ENDIF() + + IF (TARGET Emgu.runtime.windows.msvc.rt.x64.nuget) + ADD_DEPENDENCIES(${PROJECT_NAME} Emgu.runtime.windows.msvc.rt.x64.nuget) + ENDIF() + + IF (TARGET Emgu.runtime.windows.msvc.rt.x86.nuget) + ADD_DEPENDENCIES(${PROJECT_NAME} Emgu.runtime.windows.msvc.rt.x86.nuget) + ENDIF() + #ADD_DEPENDENCIES(${PROJECT_NAME} Emgu.TF.Lite.nuget) if(ENABLE_SOLUTION_FOLDERS) diff --git a/platforms/nuget/Emgu.TF.runtime.windows/CMakeLists.txt b/platforms/nuget/Emgu.TF.runtime.windows/CMakeLists.txt index 55f3f942..34bba606 100644 --- a/platforms/nuget/Emgu.TF.runtime.windows/CMakeLists.txt +++ b/platforms/nuget/Emgu.TF.runtime.windows/CMakeLists.txt @@ -50,6 +50,10 @@ IF (TARGET Emgu.runtime.windows.zlibwapi.x64.nuget) ADD_DEPENDENCIES(${PROJECT_NAME} Emgu.runtime.windows.zlibwapi.x64.nuget) ENDIF() +IF (TARGET Emgu.runtime.windows.msvc.rt.x64.nuget) + ADD_DEPENDENCIES(${PROJECT_NAME} Emgu.runtime.windows.msvc.rt.x64.nuget) +ENDIF() + if(ENABLE_SOLUTION_FOLDERS) set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "NUGET")