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
f57e3ce5
Commit
f57e3ce5
authored
Jun 22, 2016
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmake: don't use absolute paths with/without CMAKE_INSTALL_PREFIX
CPack can't work with absolute paths.
parent
a76fd435
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
4 deletions
+8
-4
CMakeLists.txt
CMakeLists.txt
+1
-1
OpenCVGenConfig.cmake
cmake/OpenCVGenConfig.cmake
+2
-2
OpenCVUtils.cmake
cmake/OpenCVUtils.cmake
+5
-1
No files found.
CMakeLists.txt
View file @
f57e3ce5
...
...
@@ -386,7 +386,7 @@ else()
ocv_update
(
OPENCV_SAMPLES_SRC_INSTALL_PATH samples/native
)
ocv_update
(
OPENCV_JAR_INSTALL_PATH java
)
ocv_update
(
OPENCV_OTHER_INSTALL_PATH etc
)
ocv_update
(
OPENCV_CONFIG_INSTALL_PATH
""
)
ocv_update
(
OPENCV_CONFIG_INSTALL_PATH
"
.
"
)
else
()
ocv_update
(
OPENCV_LIB_INSTALL_PATH lib
${
LIB_SUFFIX
}
)
ocv_update
(
OPENCV_3P_LIB_INSTALL_PATH share/OpenCV/3rdparty/
${
OPENCV_LIB_INSTALL_PATH
}
)
...
...
cmake/OpenCVGenConfig.cmake
View file @
f57e3ce5
...
...
@@ -79,7 +79,7 @@ function(ocv_gen_config TMP_DIR NESTED_PATH ROOT_NAME)
install
(
FILES
"
${
TMP_DIR
}
/OpenCVConfig-version.cmake"
"
${
__tmp_nested
}
/OpenCVConfig.cmake"
DESTINATION
"
${
CMAKE_INSTALL_PREFIX
}
/
${
__install_nested
}
"
COMPONENT dev
)
DESTINATION
"
${
__install_nested
}
"
COMPONENT dev
)
if
(
ROOT_NAME
)
# Root config file
...
...
@@ -87,7 +87,7 @@ function(ocv_gen_config TMP_DIR NESTED_PATH ROOT_NAME)
install
(
FILES
"
${
TMP_DIR
}
/OpenCVConfig-version.cmake"
"
${
TMP_DIR
}
/OpenCVConfig.cmake"
DESTINATION
"
${
CMAKE_INSTALL_PREFIX
}
/
${
OPENCV_CONFIG_INSTALL_PATH
}
"
COMPONENT dev
)
DESTINATION
"
${
OPENCV_CONFIG_INSTALL_PATH
}
"
COMPONENT dev
)
endif
()
endfunction
()
...
...
cmake/OpenCVUtils.cmake
View file @
f57e3ce5
...
...
@@ -87,7 +87,11 @@ endmacro()
macro
(
ocv_path_join result_var P1 P2
)
string
(
REGEX REPLACE
"^[/]+"
""
P2
"
${
P2
}
"
)
if
(
"
${
P1
}
"
STREQUAL
""
)
set
(
${
result_var
}
"
${
P2
}
"
)
if
(
"
${
P2
}
"
STREQUAL
""
)
set
(
${
result_var
}
"."
)
else
()
set
(
${
result_var
}
"
${
P2
}
"
)
endif
()
elseif
(
"
${
P1
}
"
STREQUAL
"/"
)
set
(
${
result_var
}
"/
${
P2
}
"
)
elseif
(
"
${
P2
}
"
STREQUAL
""
)
...
...
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