diff options
| author | Pierre Ossman <ossman@cendio.se> | 2022-05-30 10:02:05 +0200 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2022-06-07 10:06:32 +0200 |
| commit | 1527f0b6dbfa8695ca3d17ca51f711add12c6664 (patch) | |
| tree | dd9d5e343670db950e8d93e9865cd612a826848b /common | |
| parent | 115d3f883e2fceea0f2e7df0e570864a01178f4e (diff) | |
| download | tigervnc-1527f0b6dbfa8695ca3d17ca51f711add12c6664.tar.gz tigervnc-1527f0b6dbfa8695ca3d17ca51f711add12c6664.zip | |
Use pkg-config for pixman
This is the standard method of finding it on Unix systems, so make sure
we use it. Still keep a fallback, though, for other systems, e.g.
Windows.
Diffstat (limited to 'common')
| -rw-r--r-- | common/rfb/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/common/rfb/CMakeLists.txt b/common/rfb/CMakeLists.txt index 07728453..1b43ed11 100644 --- a/common/rfb/CMakeLists.txt +++ b/common/rfb/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(${CMAKE_SOURCE_DIR}/common ${JPEG_INCLUDE_DIR} ${PIXMAN_INCLUDE_DIR}) +include_directories(${CMAKE_SOURCE_DIR}/common ${JPEG_INCLUDE_DIR} ${PIXMAN_INCLUDE_DIRS}) add_library(rfb STATIC Blacklist.cxx @@ -65,7 +65,8 @@ add_library(rfb STATIC util.cxx) target_link_libraries(rfb os rdr) -target_link_libraries(rfb ${JPEG_LIBRARIES} ${PIXMAN_LIBRARY}) +target_link_libraries(rfb ${JPEG_LIBRARIES} ${PIXMAN_LIBRARIES}) +target_link_directories(rfb PUBLIC ${PIXMAN_LIBRARY_DIRS}) if(ENABLE_H264 AND NOT H264_LIBS STREQUAL "NONE") target_sources(rfb PRIVATE H264Decoder.cxx H264DecoderContext.cxx) |