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.

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

Fix #30, Apple is Unix, so check for Apple first #31

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix #30, Apple is Unix, so check for Apple first #31

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions examples/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@ find_package( OpenCV REQUIRED )
include_directories(${OPENCV_INCLUDE_DIR})

if (${OpenCV_VERSION_MINOR} LESS 3)
if (UNIX)
if (APPLE)
elseif (UNIX)
set(CV_LIBS_1 highgui)
set(CV_LIBS_2 cxcore cv cvaux)
elseif (WIN32)
set(CV_LIBS_1 highgui${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH})
set(CV_LIBS_2 cxcore${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH} cv${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH} cvaux${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH})
elseif (APPLE)
endif (UNIX)
endif (APPLE)
else(${OpenCV_VERSION_MINOR} LESS 3)
if (UNIX)
if (APPLE)
elseif (UNIX)
set(CV_LIBS_1 opencv_highgui)
set(CV_LIBS_2 opencv_core opencv_objdetect)
elseif (WIN32)
set(CV_LIBS_1 opencv_highgui${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH})
set(CV_LIBS_2 opencv_core${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH} opencv_objdetect${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH})
elseif (APPLE)
endif (UNIX)
endif (APPLE)
endif(${OpenCV_VERSION_MINOR} LESS 3)

set(${PROJECT_NAME}_simple_example_srcs simple_example.cpp)
Expand Down