Skip to content

Commit 81efce7

Browse files
authored
Merge pull request #335 from ferdnyc/cmake-with-loops
Fix my CMakeLists indentation
2 parents a25e43a + ee4666f commit 81efce7

File tree

2 files changed

+29
-29
lines changed

2 files changed

+29
-29
lines changed

src/CMakeLists.txt

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@ ENDIF (ImageMagick_FOUND)
8989
FIND_PACKAGE(FFmpeg REQUIRED)
9090

9191
foreach(ffmpeg_comp AVCODEC AVDEVICE AVFORMAT AVFILTER AVUTIL POSTPROC SWSCALE SWRESAMPLE AVRESAMPLE)
92-
if(${ffmpeg_comp}_FOUND)
93-
list(APPEND FF_INCLUDES ${${ffmpeg_comp}_INCLUDE_DIRS})
94-
add_definitions(${${ffmpeg_comp}_DEFINITIONS})
95-
list(APPEND FF_LIBRARIES ${${ffmpeg_comp}_LIBRARIES})
96-
endif()
92+
if(${ffmpeg_comp}_FOUND)
93+
list(APPEND FF_INCLUDES ${${ffmpeg_comp}_INCLUDE_DIRS})
94+
add_definitions(${${ffmpeg_comp}_DEFINITIONS})
95+
list(APPEND FF_LIBRARIES ${${ffmpeg_comp}_LIBRARIES})
96+
endif()
9797
endforeach()
9898
list(REMOVE_DUPLICATES FF_INCLUDES)
9999
include_directories(${FF_INCLUDES})
@@ -108,15 +108,15 @@ include_directories(${LIBOPENSHOT_AUDIO_INCLUDE_DIRS})
108108
################# QT5 ###################
109109
# Find QT5 libraries
110110
foreach(qt_lib Qt5Widgets Qt5Core Qt5Gui Qt5Multimedia Qt5MultimediaWidgets)
111-
find_package(${qt_lib} REQUIRED)
112-
# Header files
113-
include_directories(${${qt_lib}_INCLUDE_DIRS})
114-
# Compiler definitions
115-
add_definitions(${${qt_lib}_DEFINITIONS})
116-
# Other CFLAGS
117-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${${qt_lib}_EXECUTABLE_COMPILE_FLAGS}")
118-
# For use when linking
119-
list(APPEND QT_LIBRARIES ${${qt_lib}_LIBRARIES})
111+
find_package(${qt_lib} REQUIRED)
112+
# Header files
113+
include_directories(${${qt_lib}_INCLUDE_DIRS})
114+
# Compiler definitions
115+
add_definitions(${${qt_lib}_DEFINITIONS})
116+
# Other CFLAGS
117+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${${qt_lib}_EXECUTABLE_COMPILE_FLAGS}")
118+
# For use when linking
119+
list(APPEND QT_LIBRARIES ${${qt_lib}_LIBRARIES})
120120
endforeach()
121121

122122
# Manually moc Qt files
@@ -337,9 +337,9 @@ add_subdirectory(bindings)
337337

338338
########### PRINT FEATURE SUMMARY ##############
339339
feature_summary(WHAT ALL
340-
INCLUDE_QUIET_PACKAGES
341-
DESCRIPTION "Build configuration:"
342-
VAR featuresText)
340+
INCLUDE_QUIET_PACKAGES
341+
DESCRIPTION "Build configuration:"
342+
VAR featuresText)
343343
message("\n${featuresText}")
344344

345345
############### INSTALL HEADERS & LIBRARY ################

tests/CMakeLists.txt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@ ENDIF (ImageMagick_FOUND)
8282
FIND_PACKAGE(FFmpeg REQUIRED)
8383

8484
foreach(ffmpeg_comp AVCODEC AVDEVICE AVFORMAT AVFILTER AVUTIL POSTPROC SWSCALE SWRESAMPLE AVRESAMPLE)
85-
if(${ffmpeg_comp}_FOUND)
86-
# Include FFmpeg headers (needed for compile)
87-
list(APPEND FF_INCLUDES ${${ffmpeg_comp}_INCLUDE_DIRS})
88-
add_definitions(${${ffmpeg_comp}_DEFINITIONS})
89-
endif()
85+
if(${ffmpeg_comp}_FOUND)
86+
# Include FFmpeg headers (needed for compile)
87+
list(APPEND FF_INCLUDES ${${ffmpeg_comp}_INCLUDE_DIRS})
88+
add_definitions(${${ffmpeg_comp}_DEFINITIONS})
89+
endif()
9090
endforeach()
9191
list(REMOVE_DUPLICATES FF_INCLUDES)
9292
include_directories(${FF_INCLUDES})
@@ -101,13 +101,13 @@ include_directories(${LIBOPENSHOT_AUDIO_INCLUDE_DIRS})
101101
################# QT5 ###################
102102
# Find QT5 libraries
103103
foreach(qt_lib Qt5Widgets Qt5Core Qt5Gui Qt5Multimedia Qt5MultimediaWidgets)
104-
find_package(${qt_lib} REQUIRED)
105-
# Header files
106-
list(APPEND QT_INCLUDES ${${qt_lib}_INCLUDE_DIRS})
107-
# Compiler definitions
108-
add_definitions(${${qt_lib}_DEFINITIONS})
109-
# Other CFLAGS
110-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${${qt_lib}_EXECUTABLE_COMPILE_FLAGS}")
104+
find_package(${qt_lib} REQUIRED)
105+
# Header files
106+
list(APPEND QT_INCLUDES ${${qt_lib}_INCLUDE_DIRS})
107+
# Compiler definitions
108+
add_definitions(${${qt_lib}_DEFINITIONS})
109+
# Other CFLAGS
110+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${${qt_lib}_EXECUTABLE_COMPILE_FLAGS}")
111111
endforeach()
112112
list(REMOVE_DUPLICATES QT_INCLUDES)
113113
include_directories(${QT_INCLUDES})

0 commit comments

Comments
 (0)