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
6bd5d7f0
Commit
6bd5d7f0
authored
Jan 12, 2019
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmake: don't use LIB_SUFFIX with CMAKE_INSTALL_LIBDIR
parent
78bd55c8
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
CMakeLists.txt
CMakeLists.txt
+2
-2
No files found.
CMakeLists.txt
View file @
6bd5d7f0
...
...
@@ -592,7 +592,7 @@ else()
ocv_update
(
OPENCV_CONFIG_INSTALL_PATH
"."
)
else
()
include
(
GNUInstallDirs
)
ocv_update
(
OPENCV_LIB_INSTALL_PATH
${
CMAKE_INSTALL_LIBDIR
}
${
LIB_SUFFIX
}
)
ocv_update
(
OPENCV_LIB_INSTALL_PATH
${
CMAKE_INSTALL_LIBDIR
}
)
ocv_update
(
OPENCV_3P_LIB_INSTALL_PATH share/OpenCV/3rdparty/
${
OPENCV_LIB_INSTALL_PATH
}
)
ocv_update
(
OPENCV_SAMPLES_SRC_INSTALL_PATH share/OpenCV/samples
)
ocv_update
(
OPENCV_JAR_INSTALL_PATH share/OpenCV/java
)
...
...
@@ -601,7 +601,7 @@ else()
if
(
NOT DEFINED OPENCV_CONFIG_INSTALL_PATH
)
math
(
EXPR SIZEOF_VOID_P_BITS
"8 *
${
CMAKE_SIZEOF_VOID_P
}
"
)
if
(
LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX
)
ocv_update
(
OPENCV_CONFIG_INSTALL_PATH
${
CMAKE_INSTALL_LIBDIR
}
${
LIB_SUFFIX
}
/cmake/opencv
)
ocv_update
(
OPENCV_CONFIG_INSTALL_PATH
${
CMAKE_INSTALL_LIBDIR
}
/cmake/opencv
)
else
()
ocv_update
(
OPENCV_CONFIG_INSTALL_PATH share/OpenCV
)
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