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
03435c0d
Commit
03435c0d
authored
Aug 08, 2014
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix IOS framework
parent
d0f789dc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
1 deletion
+27
-1
CMakeLists.txt
modules/videoio/CMakeLists.txt
+4
-1
CMakeLists.txt
modules/world/CMakeLists.txt
+23
-0
No files found.
modules/videoio/CMakeLists.txt
View file @
03435c0d
...
@@ -27,7 +27,10 @@ set(videoio_srcs
...
@@ -27,7 +27,10 @@ set(videoio_srcs
${
CMAKE_CURRENT_LIST_DIR
}
/src/cap_ffmpeg.cpp
${
CMAKE_CURRENT_LIST_DIR
}
/src/cap_ffmpeg.cpp
)
)
file
(
GLOB videoio_ext_hdrs
"include/opencv2/*.hpp"
"include/opencv2/
${
name
}
/*.hpp"
"include/opencv2/
${
name
}
/*.h"
)
file
(
GLOB videoio_ext_hdrs
"
${
CMAKE_CURRENT_LIST_DIR
}
/include/opencv2/*.hpp"
"
${
CMAKE_CURRENT_LIST_DIR
}
/include/opencv2/
${
name
}
/*.hpp"
"
${
CMAKE_CURRENT_LIST_DIR
}
/include/opencv2/
${
name
}
/*.h"
)
if
(
WIN32 AND NOT ARM
)
if
(
WIN32 AND NOT ARM
)
list
(
APPEND videoio_srcs
${
CMAKE_CURRENT_LIST_DIR
}
/src/cap_cmu.cpp
)
list
(
APPEND videoio_srcs
${
CMAKE_CURRENT_LIST_DIR
}
/src/cap_cmu.cpp
)
...
...
modules/world/CMakeLists.txt
View file @
03435c0d
...
@@ -53,3 +53,26 @@ endif()
...
@@ -53,3 +53,26 @@ endif()
if
(
BUILD_opencv_highgui
)
if
(
BUILD_opencv_highgui
)
ocv_highgui_configure_target
()
ocv_highgui_configure_target
()
endif
()
endif
()
if
(
IOS OR APPLE
)
set
(
merge_libs
""
)
macro
(
ios_include_3party_libs
)
foreach
(
l
${
ARGN
}
)
add_dependencies
(
${
the_module
}
${
l
}
)
list
(
APPEND merge_libs
"$<TARGET_LINKER_FILE:
${
l
}
>"
)
endforeach
()
endmacro
()
if
(
WITH_PNG
)
ios_include_3party_libs
(
zlib libpng
)
endif
()
if
(
WITH_JPEG
)
ios_include_3party_libs
(
libjpeg
)
endif
()
add_custom_command
(
TARGET
${
the_module
}
POST_BUILD
COMMAND /usr/bin/libtool -static -o
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
the_module
}
_fat.a $<TARGET_LINKER_FILE:
${
the_module
}
>
${
merge_libs
}
COMMAND mv
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
the_module
}
_fat.a $<TARGET_LINKER_FILE:
${
the_module
}
>
)
endif
()
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