From 5a75808516ff65142528fc7229fe3479e77b7b33 Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Fri, 13 Sep 2019 15:51:15 +0300 Subject: [PATCH] Windows: partially restore install config generation --- cmake/OpenCVGenConfig.cmake | 6 ++++-- cmake/OpenCVInstallLayout.cmake | 16 ++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/cmake/OpenCVGenConfig.cmake b/cmake/OpenCVGenConfig.cmake index 64331f7..c7f9fc2 100644 --- a/cmake/OpenCVGenConfig.cmake +++ b/cmake/OpenCVGenConfig.cmake @@ -122,8 +122,10 @@ endif() # Part 3/3: ${BIN_DIR}/win-install/OpenCVConfig.cmake -> For use within binary installers/packages # -------------------------------------------------------------------------------------------- if(WIN32) - if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) - ocv_gen_config("${CMAKE_BINARY_DIR}/win-install" "${OPENCV_LIB_INSTALL_PATH}" "OpenCVConfig.root-WIN32.cmake.in") + if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows AND NOT OPENCV_SKIP_CMAKE_ROOT_CONFIG) + ocv_gen_config("${CMAKE_BINARY_DIR}/win-install" + "${OPENCV_INSTALL_BINARIES_PREFIX}${OPENCV_INSTALL_BINARIES_SUFFIX}" + "OpenCVConfig.root-WIN32.cmake.in") else() ocv_gen_config("${CMAKE_BINARY_DIR}/win-install" "" "") endif() diff --git a/cmake/OpenCVInstallLayout.cmake b/cmake/OpenCVInstallLayout.cmake index 86fd6ab..4995120 100644 --- a/cmake/OpenCVInstallLayout.cmake +++ b/cmake/OpenCVInstallLayout.cmake @@ -23,15 +23,15 @@ if(ANDROID) elseif(WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows) if(DEFINED OpenCV_RUNTIME AND DEFINED OpenCV_ARCH) - set(_prefix "${OpenCV_ARCH}/${OpenCV_RUNTIME}/") + ocv_update(OPENCV_INSTALL_BINARIES_PREFIX "${OpenCV_ARCH}/${OpenCV_RUNTIME}/") else() message(STATUS "Can't detect runtime and/or arch") - set(_prefix "") + ocv_update(OPENCV_INSTALL_BINARIES_PREFIX "") endif() if(OpenCV_STATIC) - set(_suffix "staticlib") + ocv_update(OPENCV_INSTALL_BINARIES_SUFFIX "staticlib") else() - set(_suffix "lib") + ocv_update(OPENCV_INSTALL_BINARIES_SUFFIX "lib") endif() if(INSTALL_CREATE_DISTRIB) set(_jni_suffix "/${OpenCV_ARCH}") @@ -39,12 +39,12 @@ elseif(WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows) set(_jni_suffix "") endif() - ocv_update(OPENCV_BIN_INSTALL_PATH "${_prefix}bin") + ocv_update(OPENCV_BIN_INSTALL_PATH "${OPENCV_INSTALL_BINARIES_PREFIX}bin") ocv_update(OPENCV_TEST_INSTALL_PATH "${OPENCV_BIN_INSTALL_PATH}") - ocv_update(OPENCV_SAMPLES_BIN_INSTALL_PATH "${_prefix}samples") - ocv_update(OPENCV_LIB_INSTALL_PATH "${_prefix}${_suffix}") + ocv_update(OPENCV_SAMPLES_BIN_INSTALL_PATH "${OPENCV_INSTALL_BINARIES_PREFIX}samples") + ocv_update(OPENCV_LIB_INSTALL_PATH "${OPENCV_INSTALL_BINARIES_PREFIX}${OPENCV_INSTALL_BINARIES_SUFFIX}") ocv_update(OPENCV_LIB_ARCHIVE_INSTALL_PATH "${OPENCV_LIB_INSTALL_PATH}") - ocv_update(OPENCV_3P_LIB_INSTALL_PATH "${_prefix}staticlib") + ocv_update(OPENCV_3P_LIB_INSTALL_PATH "${OPENCV_INSTALL_BINARIES_PREFIX}staticlib") ocv_update(OPENCV_CONFIG_INSTALL_PATH ".") ocv_update(OPENCV_INCLUDE_INSTALL_PATH "include") ocv_update(OPENCV_OTHER_INSTALL_PATH "etc") -- 2.7.4