Skip to content

Merge develop to master #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DayUx merged 2 commits into from
Apr 6, 2026
Merged

Merge develop to master #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce8c606
Fix : SubvisionNET namespace not found
DayUx Apr 6, 2026
7321889
Merge pull request #11 from subvision-soft/Fix/Nuget-Package
DayUx Apr 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
)

Expand Down Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\
Expand Down
2 changes: 1 addition & 1 deletion Subvision.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</metadata>
<files>
<!-- x64 native binaries -->
<file src="runtimes\win-x64\native\subvision-x64.dll"
<file src="runtimes\win-x64\native\SubvisionNET.dll"
target="runtimes\win-x64\native" />
<file src="runtimes\win-x64\native\opencv_*.dll"
target="runtimes\win-x64\native" />
Expand Down
10 changes: 9 additions & 1 deletion Subvision.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,15 @@
</PropertyGroup>

<ItemGroup>
<!-- Copy native DLLs to output directory -->
<!-- Add reference to the managed wrapper -->
<Reference Include="SubvisionNET" Condition="Exists('$(MSBuildThisFileDirectory)..\..\runtimes\$(_SubvisionRID)\native\SubvisionNET.dll')">
<HintPath>$(MSBuildThisFileDirectory)..\..\runtimes\$(_SubvisionRID)\native\SubvisionNET.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>

<ItemGroup>
<!-- Copy all DLLs (including native dependencies and the wrapper) to output directory -->
<None Include="$(MSBuildThisFileDirectory)..\..\runtimes\$(_SubvisionRID)\native\*.dll"
Condition="Exists('$(MSBuildThisFileDirectory)..\..\runtimes\$(_SubvisionRID)\native\')"
CopyToOutputDirectory="PreserveNewest"
Expand Down
2 changes: 1 addition & 1 deletion docs/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Subvision CV runs on three platforms from a single C++ codebase:
|----------|-----------|--------|
| **Native C++** | OpenCV + CMake | Static library (`subvision_lib`) |
| **WebAssembly** | Emscripten + embind | ES6 module (`subvision_core_es6.js`) |
| **.NET** | C++/CLI wrapper | Managed DLL (`subvision-x64.dll`) |
| **.NET** | C++/CLI wrapper | Managed DLL (`SubvisionNET.dll`) |

## Documentation Sections

Expand Down
4 changes: 2 additions & 2 deletions docs/manual/getting-started.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ cmake --build . --config Release
```

Output:
- `build-dotnet-x64/bin/x64/subvision-x64.dll`
- `build-dotnet-x86/bin/x86/subvision-x86.dll`
- `build-dotnet-x64/bin/x64/SubvisionNET.dll`
- `build-dotnet-x86/bin/x86/SubvisionNET.dll`

---

Expand Down
Loading