File tree Expand file tree Collapse file tree 3 files changed +8
-4
lines changed Expand file tree Collapse file tree 3 files changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -386,7 +386,7 @@ else()
386386 ocv_update(OPENCV_SAMPLES_SRC_INSTALL_PATH samples/native)
387387 ocv_update(OPENCV_JAR_INSTALL_PATH java)
388388 ocv_update(OPENCV_OTHER_INSTALL_PATH etc)
389- ocv_update(OPENCV_CONFIG_INSTALL_PATH "" )
389+ ocv_update(OPENCV_CONFIG_INSTALL_PATH ". " )
390390 else ()
391391 ocv_update(OPENCV_LIB_INSTALL_PATH lib${LIB_SUFFIX} )
392392 ocv_update(OPENCV_3P_LIB_INSTALL_PATH share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH} )
Original file line number Diff line number Diff line change @@ -79,15 +79,15 @@ function(ocv_gen_config TMP_DIR NESTED_PATH ROOT_NAME)
7979 install (FILES
8080 "${TMP_DIR} /OpenCVConfig-version.cmake"
8181 "${__tmp_nested} /OpenCVConfig.cmake"
82- DESTINATION "${CMAKE_INSTALL_PREFIX} / ${ __install_nested} " COMPONENT dev)
82+ DESTINATION "${__install_nested} " COMPONENT dev)
8383
8484 if (ROOT_NAME)
8585 # Root config file
8686 configure_file ("${OpenCV_SOURCE_DIR} /cmake/templates/${ROOT_NAME} " "${TMP_DIR} /OpenCVConfig.cmake" @ONLY)
8787 install (FILES
8888 "${TMP_DIR} /OpenCVConfig-version.cmake"
8989 "${TMP_DIR} /OpenCVConfig.cmake"
90- DESTINATION "${CMAKE_INSTALL_PREFIX} / ${ OPENCV_CONFIG_INSTALL_PATH} " COMPONENT dev)
90+ DESTINATION "${OPENCV_CONFIG_INSTALL_PATH} " COMPONENT dev)
9191 endif ()
9292endfunction ()
9393
Original file line number Diff line number Diff line change @@ -87,7 +87,11 @@ endmacro()
8787macro (ocv_path_join result_var P1 P2)
8888 string (REGEX REPLACE "^[/]+" "" P2 "${P2} " )
8989 if ("${P1} " STREQUAL "" )
90- set (${result_var} "${P2} " )
90+ if ("${P2} " STREQUAL "" )
91+ set (${result_var} "." )
92+ else ()
93+ set (${result_var} "${P2} " )
94+ endif ()
9195 elseif ("${P1} " STREQUAL "/" )
9296 set (${result_var} "/${P2} " )
9397 elseif ("${P2} " STREQUAL "" )
You can’t perform that action at this time.
0 commit comments