CMake: Eliminate duplicate include dirs

Author: ferdnyc

src/CMakeLists.txt

@@ -90,12 +90,13 @@ FIND_PACKAGE(FFmpeg REQUIRED)
 
 foreach(ffmpeg_comp AVCODEC AVDEVICE AVFORMAT AVFILTER AVUTIL POSTPROC SWSCALE SWRESAMPLE AVRESAMPLE)
 	if(${ffmpeg_comp}_FOUND)
-		# message(STATUS "Adding include dir for ${ffmpeg_comp}")
-		include_directories(${${ffmpeg_comp}_INCLUDE_DIRS})
+		list(APPEND FF_INCLUDES ${${ffmpeg_comp}_INCLUDE_DIRS})
 		add_definitions(${${ffmpeg_comp}_DEFINITIONS})
 		list(APPEND FF_LIBRARIES ${${ffmpeg_comp}_LIBRARIES})
   endif()
 endforeach()
+list(REMOVE_DUPLICATES FF_INCLUDES)
+include_directories(${FF_INCLUDES})
 
 ################# LIBOPENSHOT-AUDIO ###################
 # Find JUCE-based openshot Audio libraries

tests/CMakeLists.txt

@@ -84,10 +84,12 @@ FIND_PACKAGE(FFmpeg REQUIRED)
 foreach(ffmpeg_comp AVCODEC AVDEVICE AVFORMAT AVFILTER AVUTIL POSTPROC SWSCALE SWRESAMPLE AVRESAMPLE)
 	if(${ffmpeg_comp}_FOUND)
 		# Include FFmpeg headers (needed for compile)
-		include_directories(${${ffmpeg_comp}_INCLUDE_DIRS})
+		list(APPEND FF_INCLUDES ${${ffmpeg_comp}_INCLUDE_DIRS})
 		add_definitions(${${ffmpeg_comp}_DEFINITIONS})
   endif()
 endforeach()
+list(REMOVE_DUPLICATES FF_INCLUDES)
+include_directories(${FF_INCLUDES})
 
 ################# LIBOPENSHOT-AUDIO ###################
 # Find JUCE-based openshot Audio libraries
@@ -101,12 +103,14 @@ include_directories(${LIBOPENSHOT_AUDIO_INCLUDE_DIRS})
 foreach(qt_lib Qt5Widgets Qt5Core Qt5Gui Qt5Multimedia Qt5MultimediaWidgets)
 	find_package(${qt_lib} REQUIRED)
 	# Header files
-	include_directories(${${qt_lib}_INCLUDE_DIRS})
+	list(APPEND QT_INCLUDES ${${qt_lib}_INCLUDE_DIRS})
 	# Compiler definitions
 	add_definitions(${${qt_lib}_DEFINITIONS})
 	# Other CFLAGS
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${${qt_lib}_EXECUTABLE_COMPILE_FLAGS}")
 endforeach()
+list(REMOVE_DUPLICATES QT_INCLUDES)
+include_directories(${QT_INCLUDES})
 
 # Manually moc Qt files
 qt5_wrap_cpp(MOC_FILES ${QT_HEADER_FILES})