diff --git a/CMakeLists.txt b/CMakeLists.txt index 938532d..20fb47e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -102,9 +102,9 @@ if (BUILD_CLI_WRAPPER AND NOT EMSCRIPTEN) # compatible. The VC++ Redistributable is required on target machines, but it # is already installed on the vast majority of Windows machines. - # Set output name with architecture suffix + # Set output name set_target_properties(Subvision PROPERTIES - OUTPUT_NAME "subvision-${ARCH_SUFFIX}" + OUTPUT_NAME "SubvisionNET" RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/${ARCH_SUFFIX}" ) @@ -147,7 +147,7 @@ if (BUILD_CLI_WRAPPER AND NOT EMSCRIPTEN) ) else () message(WARNING "Could not find OpenCV DLLs (opencv_*.dll) in ${_OPENCV_BIN_DIR}. " - "You will need to manually place the OpenCV binaries next to subvision-${ARCH_SUFFIX}.dll") + "You will need to manually place the OpenCV binaries next to SubvisionNET.dll") endif () else () message(WARNING "C++/CLI wrapper requires MSVC compiler") diff --git a/Makefile b/Makefile index 074847c..931bfc3 100644 --- a/Makefile +++ b/Makefile @@ -108,7 +108,7 @@ subvision_nuget: subvision_dotnet_all ifeq ($(OS),Windows_NT) @if not exist nupkg mkdir nupkg @if not exist nupkg\runtimes\win-x64\native mkdir nupkg\runtimes\win-x64\native - @copy build-dotnet-x64\bin\x64\Release\subvision-x64.dll nupkg\runtimes\win-x64\native\ + @copy build-dotnet-x64\bin\x64\Release\SubvisionNET.dll nupkg\runtimes\win-x64\native\ @copy build-dotnet-x64\bin\x64\Release\opencv_*.dll nupkg\runtimes\win-x64\native\ @copy Subvision.nuspec nupkg\ @copy Subvision.targets nupkg\ diff --git a/Subvision.nuspec b/Subvision.nuspec index a0e18ef..4e82490 100644 --- a/Subvision.nuspec +++ b/Subvision.nuspec @@ -17,7 +17,7 @@ - diff --git a/Subvision.targets b/Subvision.targets index d77300b..fb7b8fe 100644 --- a/Subvision.targets +++ b/Subvision.targets @@ -18,7 +18,15 @@ - + + + $(MSBuildThisFileDirectory)..\..\runtimes\$(_SubvisionRID)\native\SubvisionNET.dll + False + + + + +