openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #335 from ferdnyc/cmake-with-loops

Browse Source 
Fix my CMakeLists indentation
This commit is contained in:
Frank Dana
2019-09-25 06:54:38 -04:00
committed by GitHub
parent a25e43a6db ee4666f15b
commit 81efce7464
2 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/CMakeLists.txt
View File

@@ -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 ################

24
tests/CMakeLists.txt
View File

@@ -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})