From ee4666f15bdbd149149589db01d1d88835eabf40 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Wed, 25 Sep 2019 05:53:00 -0400 Subject: [PATCH] Fix indentation --- src/CMakeLists.txt | 34 +++++++++++++++++----------------- tests/CMakeLists.txt | 24 ++++++++++++------------ 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 040e45b7..4045b7d0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -89,11 +89,11 @@ ENDIF (ImageMagick_FOUND) FIND_PACKAGE(FFmpeg REQUIRED) foreach(ffmpeg_comp AVCODEC AVDEVICE AVFORMAT AVFILTER AVUTIL POSTPROC SWSCALE SWRESAMPLE AVRESAMPLE) - if(${ffmpeg_comp}_FOUND) - list(APPEND FF_INCLUDES ${${ffmpeg_comp}_INCLUDE_DIRS}) - add_definitions(${${ffmpeg_comp}_DEFINITIONS}) - list(APPEND FF_LIBRARIES ${${ffmpeg_comp}_LIBRARIES}) - endif() + if(${ffmpeg_comp}_FOUND) + 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}) @@ -108,15 +108,15 @@ include_directories(${LIBOPENSHOT_AUDIO_INCLUDE_DIRS}) ################# QT5 ################### # Find QT5 libraries foreach(qt_lib Qt5Widgets Qt5Core Qt5Gui Qt5Multimedia Qt5MultimediaWidgets) - find_package(${qt_lib} REQUIRED) - # Header files - include_directories(${${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}") - # For use when linking - list(APPEND QT_LIBRARIES ${${qt_lib}_LIBRARIES}) + find_package(${qt_lib} REQUIRED) + # Header files + include_directories(${${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}") + # For use when linking + list(APPEND QT_LIBRARIES ${${qt_lib}_LIBRARIES}) endforeach() # Manually moc Qt files @@ -337,9 +337,9 @@ add_subdirectory(bindings) ########### PRINT FEATURE SUMMARY ############## feature_summary(WHAT ALL - INCLUDE_QUIET_PACKAGES - DESCRIPTION "Build configuration:" - VAR featuresText) + INCLUDE_QUIET_PACKAGES + DESCRIPTION "Build configuration:" + VAR featuresText) message("\n${featuresText}") ############### INSTALL HEADERS & LIBRARY ################ diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 5fb55bce..ab44fa31 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -82,11 +82,11 @@ ENDIF (ImageMagick_FOUND) 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) - list(APPEND FF_INCLUDES ${${ffmpeg_comp}_INCLUDE_DIRS}) - add_definitions(${${ffmpeg_comp}_DEFINITIONS}) - endif() + if(${ffmpeg_comp}_FOUND) + # Include FFmpeg headers (needed for compile) + list(APPEND FF_INCLUDES ${${ffmpeg_comp}_INCLUDE_DIRS}) + add_definitions(${${ffmpeg_comp}_DEFINITIONS}) + endif() endforeach() list(REMOVE_DUPLICATES FF_INCLUDES) include_directories(${FF_INCLUDES}) @@ -101,13 +101,13 @@ include_directories(${LIBOPENSHOT_AUDIO_INCLUDE_DIRS}) ################# QT5 ################### # Find QT5 libraries foreach(qt_lib Qt5Widgets Qt5Core Qt5Gui Qt5Multimedia Qt5MultimediaWidgets) - find_package(${qt_lib} REQUIRED) - # Header files - 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}") + find_package(${qt_lib} REQUIRED) + # Header files + 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})