mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #5669: If cairo is detected as part of other dependencies ignore it

Browse Source 
If WITH_CAIRO=OFF it was still used when the library was detected as
part of some other dependency. With this commit the dependency is
only added if WITH_CAIRO=ON
This commit is contained in:
Armin Novak 2019-10-23 16:13:25 +02:00
parent bd5a88e95a
commit d5fed5e998
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libfreerdp/CMakeLists.txt
View File

@ -89,20 +89,18 @@ if (WITH_CAIRO)
find_package(Cairo REQUIRED) find_package(Cairo REQUIRED)
endif(WITH_CAIRO) endif(WITH_CAIRO)
if (SWScale_FOUND) # Prefer SWScale over Cairo, both at the same time are not possible.
if (WITH_SWSCALE)
add_definitions(-DSWSCALE_FOUND=1) add_definitions(-DSWSCALE_FOUND=1)
include_directories(${SWScale_INCLUDE_DIR}) include_directories(${SWScale_INCLUDE_DIR})
freerdp_library_add(${SWScale_LIBRARY}) freerdp_library_add(${SWScale_LIBRARY})
else(SWScale_FOUND) elseif (WITH_CAIRO)
add_definitions(-DCAIRO_FOUND=1)
if (CAIRO_FOUND) include_directories(${CAIRO_INCLUDE_DIR})
add_definitions(-DCAIRO_FOUND=1) freerdp_library_add(${CAIRO_LIBRARY})
include_directories(${CAIRO_INCLUDE_DIR}) else()
freerdp_library_add(${CAIRO_LIBRARY}) message(WARNING "neither swscale nor libcairo detected, compiling without image scaling support!")
else(CAIRO_FOUND) endif()
message(WARNING "neither swscale nor libcairo detected, compiling without image scaling support!")
endif(CAIRO_FOUND)
endif(SWScale_FOUND)
set(${MODULE_PREFIX}_SUBMODULES set(${MODULE_PREFIX}_SUBMODULES
utils utils