From 2bfad68812f88388dc3313b4cb16ca4e0d857e84 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Sat, 12 Dec 2015 15:15:41 +0300 Subject: [PATCH] pkg-config: remove $ expressions --- cmake/OpenCVUtils.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake index 550237a552..2e2782b3a5 100644 --- a/cmake/OpenCVUtils.cmake +++ b/cmake/OpenCVUtils.cmake @@ -824,12 +824,18 @@ macro(ocv_get_all_libs _modules _extra _3rdparty) list(FIND ${_extra} "ippicv" ippicv_idx) if (${ippicv_idx} GREATER -1) list(REMOVE_ITEM ${_extra} "ippicv") - list(INSERT ${_3rdparty} 0 "ippicv") + if(NOT BUILD_SHARED_LIBS) + list(INSERT ${_3rdparty} 0 "ippicv") + endif() endif() # split 3rdparty libs and modules list(REMOVE_ITEM ${_modules} ${${_3rdparty}} ${${_extra}} non_empty_list) + ocv_list_filterout(${_modules} "^[\$]<") + ocv_list_filterout(${_3rdparty} "^[\$]<") + ocv_list_filterout(${_extra} "^[\$]<") + # convert CMake lists to makefile literals foreach(lst ${_modules} ${_3rdparty} ${_extra}) ocv_list_unique(${lst})