third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #22910 from alalek:cmake_pkg_config_ignore_atomic

Browse Source
This commit is contained in:
Alexander Alekhin 2022-12-03 05:22:04 +00:00
commit 07b1bc2e88
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/OpenCVUtils.cmake
View File

@ -866,7 +866,10 @@ macro(ocv_check_modules define)
foreach(flag ${${define}_LDFLAGS}) foreach(flag ${${define}_LDFLAGS})
if(flag MATCHES "^-L(.*)") if(flag MATCHES "^-L(.*)")
list(APPEND _libs_paths ${CMAKE_MATCH_1}) list(APPEND _libs_paths ${CMAKE_MATCH_1})
elseif(IS_ABSOLUTE "${flag}") elseif(IS_ABSOLUTE "${flag}"
OR flag STREQUAL "-lstdc++"
OR flag STREQUAL "-latomic"
)
list(APPEND _libs "${flag}") list(APPEND _libs "${flag}")
elseif(flag MATCHES "^-l(.*)") elseif(flag MATCHES "^-l(.*)")
set(_lib "${CMAKE_MATCH_1}") set(_lib "${CMAKE_MATCH_1}")