Browse Source

fix: Using foreach to iterate through CFLAGS_OTHER

PkgConfig use 'separate_arguments' for pkgconfig result, so output
converted to the list (in cmake it's semicolumnt separated values).
If we try to append CFLAGS_OTHER as is, it will provide error for
more then one cflag in '.pc' file

Fix #4175, fix #4457.
reviewable/pr4460/r1
Diadlo 8 years ago
parent
commit
9a0632b0cf
No known key found for this signature in database
GPG Key ID: 5AF9F2E29107C727
  1. 4
      cmake/Dependencies.cmake

4
cmake/Dependencies.cmake

@ -74,7 +74,9 @@ function(search_dependency pkg) @@ -74,7 +74,9 @@ function(search_dependency pkg)
else()
link_directories(${${pkg}_LIBRARY_DIRS})
include_directories(${${pkg}_INCLUDE_DIRS})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${${pkg}_CFLAGS_OTHER}" PARENT_SCOPE)
foreach(flag ${${pkg}_CFLAGS_OTHER})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}" PARENT_SCOPE)
endforeach()
set(ALL_LIBRARIES ${ALL_LIBRARIES} ${${pkg}_LIBRARIES} PARENT_SCOPE)
endif()

Loading…
Cancel
Save