Skip to content
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.

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

1. create a branch for mac native develop, leave master branch for py… #1

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@
/CMakeCache.txt
/DisplayImage
/cmake_install.cmake
/output
/bin
/build
20 changes: 20 additions & 0 deletions .vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"configurations": [
{
"name": "Mac",
"includePath": [
"${workspaceFolder}/**",
"/usr/local/include/opencv4/**"
],
"defines": [],
"macFrameworkPath": [
"/Library/Developer/CommandLineTools/SDKs/MacOSX10.14.sdk/System/Library/Frameworks"
],
"compilerPath": "/usr/bin/clang",
"cStandard": "c11",
"cppStandard": "c++17",
"intelliSenseMode": "clang-x64"
}
],
"version": 4
}
5 changes: 4 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@ set (CMAKE_CXX_STANDARD 11)
find_package(OpenCV REQUIRED)
include_directories(${OpenCV_INCLUDE_DIRS})

add_executable(VideoPlayer Tutorial.cpp)
add_executable(VideoPlayer VideoPlayer.cpp)
target_link_libraries(VideoPlayer ${OpenCV_LIBS})

add_executable(DisplayImage DisplayImage.cpp)
target_link_libraries(DisplayImage ${OpenCV_LIBS})

install (TARGETS VideoPlayer DESTINATION bin)
install (TARGETS DisplayImage DESTINATION bin)

16 changes: 0 additions & 16 deletions OpenCvPythonDemo/Test.py

This file was deleted.

59 changes: 0 additions & 59 deletions OpenCvPythonDemo/record_video.py

This file was deleted.

42 changes: 0 additions & 42 deletions OpenCvPythonDemo/res-change.py

This file was deleted.

5 changes: 5 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
mkdir build
cd build
## cmake -DCMAKE_INSTALL_PREFIX:PATH=../build/bin ..
cmake ..
cmake --build . --target install --config Release