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
70489b1e
Commit
70489b1e
authored
Jun 22, 2017
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmake: fix libname for pkg-config configuration
parent
e397794a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
OpenCVGenPkgconfig.cmake
cmake/OpenCVGenPkgconfig.cmake
+2
-2
OpenCVUtils.cmake
cmake/OpenCVUtils.cmake
+6
-0
No files found.
cmake/OpenCVGenPkgconfig.cmake
View file @
70489b1e
...
@@ -74,8 +74,8 @@ if(OpenCV_EXTRA_COMPONENTS)
...
@@ -74,8 +74,8 @@ if(OpenCV_EXTRA_COMPONENTS)
list
(
APPEND OpenCV_LIB_COMPONENTS_
"
${
extra_component
}
"
)
list
(
APPEND OpenCV_LIB_COMPONENTS_
"
${
extra_component
}
"
)
elseif
(
extra_component MATCHES
"[
\\
/]"
)
elseif
(
extra_component MATCHES
"[
\\
/]"
)
get_filename_component
(
libdir
"
${
extra_component
}
"
PATH
)
get_filename_component
(
libdir
"
${
extra_component
}
"
PATH
)
get_filename_component
(
libname
"
${
extra_component
}
"
NAME
_WE
)
get_filename_component
(
libname
"
${
extra_component
}
"
NAME
)
string
(
REGEX REPLACE
"^lib"
""
libname
"
${
libname
}
"
)
ocv_get_libname
(
libname
"
${
libname
}
"
)
list
(
APPEND OpenCV_LIB_COMPONENTS_
"-L
${
libdir
}
"
"-l
${
libname
}
"
)
list
(
APPEND OpenCV_LIB_COMPONENTS_
"-L
${
libdir
}
"
"-l
${
libname
}
"
)
else
()
else
()
list
(
APPEND OpenCV_LIB_COMPONENTS_
"-l
${
extra_component
}
"
)
list
(
APPEND OpenCV_LIB_COMPONENTS_
"-l
${
extra_component
}
"
)
...
...
cmake/OpenCVUtils.cmake
View file @
70489b1e
...
@@ -749,6 +749,12 @@ function(ocv_source_group group)
...
@@ -749,6 +749,12 @@ function(ocv_source_group group)
source_group
(
${
group
}
FILES
${
srcs
}
)
source_group
(
${
group
}
FILES
${
srcs
}
)
endfunction
()
endfunction
()
macro
(
ocv_get_libname var_name
)
get_filename_component
(
__libname
"
${
ARGN
}
"
NAME
)
string
(
REGEX REPLACE
"^lib(.+).(a|so)(.[.0-9]+)?$"
"
\\
1"
__libname
"
${
__libname
}
"
)
set
(
${
var_name
}
"
${
__libname
}
"
)
endmacro
()
# build the list of simple dependencies, that links via "-l"
# build the list of simple dependencies, that links via "-l"
# _all_libs - name of variable with input list
# _all_libs - name of variable with input list
# _simple - name of variable with output list of simple libs
# _simple - name of variable with output list of simple libs
...
...
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