Fix up ffmpeg header and library handling

FFMPEG is needed by the RFB library, so all the details about it should
only be applied there and not for other components.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f8cacb9dd79bff6d2c4800f2e77465a50929e790..e5807def71fc6571d1c370f0766e998976a9c1ee 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -189,7 +189,7 @@ if(ENABLE_H264)
       find_library(AVUTIL_LIBRARY avutil)
       find_path(SWSCALE_INCLUDE_DIR libswscale/swscale.h)
       find_library(SWSCALE_LIBRARY swscale)
-      include_directories(${AVCODEC_INCLUDE_DIR} ${AVUTIL_INCLUDE_DIR} ${SWSCALE_INCLUDE_DIR})
+      set(H264_INCLUDE_DIRS ${AVCODEC_INCLUDE_DIRS} ${AVUTIL_INCLUDE_DIRS} ${SWSCALE_INCLUDE_DIRS})
       set(H264_LIBRARIES ${AVCODEC_LIBRARY} ${AVUTIL_LIBRARY} ${SWSCALE_LIBRARY})
       add_definitions("-D__STDC_CONSTANT_MACROS")
       add_definitions("-DHAVE_H264")

diff --git a/common/rfb/CMakeLists.txt b/common/rfb/CMakeLists.txt
index 1b43ed114a7d73c4ecead297d9a5939d1f43d01c..66014f3e1671e92d8523e08be11b2096f28e2b18 100644 (file)
--- 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_DIRS})
+include_directories(${CMAKE_SOURCE_DIR}/common ${JPEG_INCLUDE_DIR} ${PIXMAN_INCLUDE_DIRS} ${H264_INCLUDE_DIRS})
 
 add_library(rfb STATIC
   Blacklist.cxx
@@ -75,6 +75,7 @@ if(ENABLE_H264 AND NOT H264_LIBS STREQUAL "NONE")
   elseif(H264_LIBS STREQUAL "WIN")
     target_sources(rfb PRIVATE H264WinDecoderContext.cxx)
   endif()
+  target_link_libraries(rfb ${H264_LIBRARIES})
 endif()
 
 if(UNIX)

diff --git a/tests/perf/CMakeLists.txt b/tests/perf/CMakeLists.txt
index b4cff2080f847ebf8f0332cf8c89e153cef5f717..1b5e9f77829c8650bc5f54e8b657cff9060bee1c 100644 (file)
--- a/tests/perf/CMakeLists.txt
+++ b/tests/perf/CMakeLists.txt
@@ -3,7 +3,6 @@ include_directories(${GETTEXT_INCLUDE_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/common)
 
 add_library(test_util STATIC util.cxx)
-target_link_libraries(test_util ${H264_LIBRARIES})
 
 add_executable(convperf convperf.cxx)
 target_link_libraries(convperf test_util rfb)

diff --git a/vncviewer/CMakeLists.txt b/vncviewer/CMakeLists.txt
index 51b5f3eaae4bf5369814e5f921ec6a7205015382..15eac66150cdbd351a12e4c443f521eeba7e2e5a 100644 (file)
--- a/vncviewer/CMakeLists.txt
+++ b/vncviewer/CMakeLists.txt
@@ -50,7 +50,7 @@ else()
   target_sources(vncviewer PRIVATE Surface_X11.cxx)
 endif()
 
-target_link_libraries(vncviewer rfb network rdr os ${FLTK_LIBRARIES} ${GETTEXT_LIBRARIES} ${H264_LIBRARIES})
+target_link_libraries(vncviewer rfb network rdr os ${FLTK_LIBRARIES} ${GETTEXT_LIBRARIES})
 
 if(WIN32)
   target_link_libraries(vncviewer msimg32)