Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
9336b700
Commit
9336b700
authored
May 27, 2011
by
Vadim Pisarevsky
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use FindZLIB(), FindJPEG() etc. on MacOSX as well to avoid possible conflicts with MacPorts.
parent
0b0baa0c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
25 deletions
+23
-25
CMakeLists.txt
CMakeLists.txt
+22
-24
CMakeLists.txt
modules/highgui/CMakeLists.txt
+1
-1
No files found.
CMakeLists.txt
View file @
9336b700
...
@@ -215,7 +215,7 @@ set(BUILD_TESTS ON CACHE BOOL "Build tests")
...
@@ -215,7 +215,7 @@ set(BUILD_TESTS ON CACHE BOOL "Build tests")
# Build 3rdparty libraries under unix
# Build 3rdparty libraries under unix
# ===================================================
# ===================================================
if
(
WIN32
OR APPLE
)
if
(
WIN32
)
set
(
OPENCV_BUILD_3RDPARTY_LIBS TRUE CACHE BOOL
"Build 3rd party libraries"
)
set
(
OPENCV_BUILD_3RDPARTY_LIBS TRUE CACHE BOOL
"Build 3rd party libraries"
)
else
()
else
()
set
(
OPENCV_BUILD_3RDPARTY_LIBS FALSE CACHE BOOL
"Build 3rd party libraries"
)
set
(
OPENCV_BUILD_3RDPARTY_LIBS FALSE CACHE BOOL
"Build 3rd party libraries"
)
...
@@ -425,29 +425,6 @@ if(UNIX)
...
@@ -425,29 +425,6 @@ if(UNIX)
set
(
HAVE_DC1394 FALSE
)
set
(
HAVE_DC1394 FALSE
)
endif
()
endif
()
if
(
NOT APPLE
)
CHECK_INCLUDE_FILE
(
alloca.h HAVE_ALLOCA_H
)
CHECK_FUNCTION_EXISTS
(
alloca HAVE_ALLOCA
)
CHECK_INCLUDE_FILE
(
unistd.h HAVE_UNISTD_H
)
CHECK_INCLUDE_FILE
(
pthread.h HAVE_LIBPTHREAD
)
if
(
WITH_XINE
)
CHECK_MODULE
(
libxine HAVE_XINE
)
else
()
set
(
HAVE_XINE FALSE
)
endif
()
if
(
WITH_V4L
)
CHECK_MODULE
(
libv4l1 HAVE_LIBV4L
)
CHECK_INCLUDE_FILE
(
linux/videodev.h HAVE_CAMV4L
)
CHECK_INCLUDE_FILE
(
linux/videodev2.h HAVE_CAMV4L2
)
else
()
set
(
HAVE_LIBV4L FALSE
)
set
(
HAVE_CAMV4L FALSE
)
set
(
HAVE_CAMV4L2 FALSE
)
endif
()
if
(
NOT OPENCV_BUILD_3RDPARTY_LIBS
)
if
(
NOT OPENCV_BUILD_3RDPARTY_LIBS
)
include
(
FindZLIB
)
include
(
FindZLIB
)
if
(
WITH_PNG
)
if
(
WITH_PNG
)
...
@@ -476,6 +453,27 @@ if(UNIX)
...
@@ -476,6 +453,27 @@ if(UNIX)
endif
()
endif
()
endif
()
endif
()
if
(
NOT APPLE
)
CHECK_INCLUDE_FILE
(
alloca.h HAVE_ALLOCA_H
)
CHECK_FUNCTION_EXISTS
(
alloca HAVE_ALLOCA
)
CHECK_INCLUDE_FILE
(
unistd.h HAVE_UNISTD_H
)
CHECK_INCLUDE_FILE
(
pthread.h HAVE_LIBPTHREAD
)
if
(
WITH_XINE
)
CHECK_MODULE
(
libxine HAVE_XINE
)
else
()
set
(
HAVE_XINE FALSE
)
endif
()
if
(
WITH_V4L
)
CHECK_MODULE
(
libv4l1 HAVE_LIBV4L
)
CHECK_INCLUDE_FILE
(
linux/videodev.h HAVE_CAMV4L
)
CHECK_INCLUDE_FILE
(
linux/videodev2.h HAVE_CAMV4L2
)
else
()
set
(
HAVE_LIBV4L FALSE
)
set
(
HAVE_CAMV4L FALSE
)
set
(
HAVE_CAMV4L2 FALSE
)
endif
()
if
(
${
CMAKE_SYSTEM_NAME
}
MATCHES
"FreeBSD"
OR
${
CMAKE_SYSTEM_NAME
}
MATCHES
"NetBSD"
AND NOT ANDROID
)
if
(
${
CMAKE_SYSTEM_NAME
}
MATCHES
"FreeBSD"
OR
${
CMAKE_SYSTEM_NAME
}
MATCHES
"NetBSD"
AND NOT ANDROID
)
set
(
OPENCV_LINKER_LIBS m pthread
)
set
(
OPENCV_LINKER_LIBS m pthread
)
elseif
(
ANDROID
)
elseif
(
ANDROID
)
...
...
modules/highgui/CMakeLists.txt
View file @
9336b700
...
@@ -53,7 +53,7 @@ endif()
...
@@ -53,7 +53,7 @@ endif()
if
(
WITH_JASPER
)
if
(
WITH_JASPER
)
add_definitions
(
-DHAVE_JASPER
)
add_definitions
(
-DHAVE_JASPER
)
if
(
JPEG
_FOUND
)
if
(
JASPER
_FOUND
)
include_directories
(
${
JASPER_INCLUDE_DIR
}
)
include_directories
(
${
JASPER_INCLUDE_DIR
}
)
set
(
GRFMT_LIBS
${
GRFMT_LIBS
}
${
JASPER_LIBRARIES
}
)
set
(
GRFMT_LIBS
${
GRFMT_LIBS
}
${
JASPER_LIBRARIES
}
)
else
()
else
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment