Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
2
210130133
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Summer2021
210130133
Commits
ac6898a0
Commit
ac6898a0
authored
7 years ago
by
Jinhui Yuan
Committed by
Will Zhang
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix opencv (#910)
* let opencv depend on libjpeg-turbo * fix libjpeg-turbo dependency
parent
0a3adeae
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
cmake/third_party.cmake
+0
-2
0 additions, 2 deletions
cmake/third_party.cmake
cmake/third_party/libjpeg-turbo.cmake
+3
-2
3 additions, 2 deletions
cmake/third_party/libjpeg-turbo.cmake
cmake/third_party/opencv.cmake
+1
-0
1 addition, 0 deletions
cmake/third_party/opencv.cmake
with
4 additions
and
4 deletions
cmake/third_party.cmake
+
0
−
2
View file @
ac6898a0
...
...
@@ -89,8 +89,6 @@ set(oneflow_third_party_dependencies
grpc_copy_headers_to_destination
grpc_copy_libs_to_destination
cub_copy_headers_to_destination
libjpeg_copy_headers_to_destination
libjpeg_copy_libs_to_destination
opencv_copy_headers_to_destination
opencv_copy_libs_to_destination
eigen
...
...
This diff is collapsed.
Click to expand it.
cmake/third_party/libjpeg-turbo.cmake
+
3
−
2
View file @
ac6898a0
...
...
@@ -63,7 +63,8 @@ ExternalProject_Add(libjpeg-turbo
# put libjpeg-turbo includes in the directory where they are expected
add_custom_target
(
libjpeg_create_header_dir
COMMAND
${
CMAKE_COMMAND
}
-E make_directory
${
LIBJPEG_INCLUDE_DIR
}
)
COMMAND
${
CMAKE_COMMAND
}
-E make_directory
${
LIBJPEG_INCLUDE_DIR
}
DEPENDS libjpeg-turbo
)
add_custom_target
(
libjpeg_copy_headers_to_destination
DEPENDS libjpeg_create_header_dir
)
...
...
@@ -76,7 +77,7 @@ endforeach()
# pub libjpeg libs in the directory where they are expected
add_custom_target
(
libjpeg_create_library_dir
COMMAND
${
CMAKE_COMMAND
}
-E make_directory
${
LIBJPEG_LIBRARY_DIR
}
DEPENDS
z
lib
)
DEPENDS lib
jpeg-turbo
)
add_custom_target
(
libjpeg_copy_libs_to_destination
COMMAND
${
CMAKE_COMMAND
}
-E copy_if_different
${
LIBJPEG_BUILD_STATIC_LIBRARIES
}
${
LIBJPEG_LIBRARY_DIR
}
...
...
This diff is collapsed.
Click to expand it.
cmake/third_party/opencv.cmake
+
1
−
0
View file @
ac6898a0
...
...
@@ -32,6 +32,7 @@ endforeach()
if
(
BUILD_THIRD_PARTY
)
ExternalProject_Add
(
opencv
DEPENDS libjpeg_copy_headers_to_destination libjpeg_copy_libs_to_destination
PREFIX opencv
GIT_REPOSITORY
${
OPENCV_URL
}
GIT_TAG
${
OPENCV_TAG
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment