[vlmc-devel] CMake: remove tabs and trailing spaces
Jean-Baptiste Kempf
git at videolan.org
Sat Mar 1 14:13:38 CET 2014
vlmc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Mar 1 14:12:27 2014 +0100| [87c88c5f79a9af8ef05f632f10c178144b78cfbc] | committer: Jean-Baptiste Kempf
CMake: remove tabs and trailing spaces
> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=87c88c5f79a9af8ef05f632f10c178144b78cfbc
---
CMakeLists.txt | 40 ++++++++++++++++++++--------------------
src/Backend/CMakeLists.txt | 23 +++++++++++------------
src/CMakeLists.txt | 42 +++++++++++++++++++++---------------------
3 files changed, 52 insertions(+), 53 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ed1900..61e825e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,12 +33,12 @@ IF(WIN32)
ADD_DEFINITIONS( -D__USE_MINGW_ANSI_STDIO=1 )
ENDIF(WIN32)
-# Find Git Version Patch
+# Find Git Version Patch
FIND_PROGRAM(GIT git)
IF(GIT)
EXECUTE_PROCESS(
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
- COMMAND ${GIT} rev-parse --short HEAD
+ COMMAND ${GIT} rev-parse --short HEAD
OUTPUT_VARIABLE GIT_OUT OUTPUT_STRIP_TRAILING_WHITESPACE
)
SET(GIT_PATCH "git${GIT_OUT}")
@@ -122,9 +122,9 @@ SET(CMAKE_PREFIX_PATH "/usr/local/opt/qt5")
# search for Qt4
if (NOT FORCE_QT4)
- find_package(Qt5Core QUIET)
- if (Qt5Core_FOUND)
- message(STATUS "Using qt5")
+ find_package(Qt5Core QUIET)
+ if (Qt5Core_FOUND)
+ message(STATUS "Using qt5")
# go on with other packages
if(WITH_GUI)
find_package(Qt5 COMPONENTS Widgets Gui Xml Network)
@@ -132,9 +132,9 @@ if (NOT FORCE_QT4)
find_packages(Qt5 COMPONENTS Xml Network)
endif()
- macro(qt_use_modules)
- qt5_use_modules(${ARGN})
- endmacro()
+ macro(qt_use_modules)
+ qt5_use_modules(${ARGN})
+ endmacro()
macro(qt_wrap_ui)
qt5_wrap_ui(${ARGN})
@@ -151,17 +151,17 @@ if (NOT FORCE_QT4)
endif()
endif()
if(NOT Qt5Core_FOUND)
- if (NOT FORCE_QT4)
- message(STATUS "Could not find Qt5, searching for Qt4 instead...")
- endif()
+ if (NOT FORCE_QT4)
+ message(STATUS "Could not find Qt5, searching for Qt4 instead...")
+ endif()
- set(NEEDED_QT4_COMPONENTS "QtCore" "QtXml" "QtNetwork")
+ set(NEEDED_QT4_COMPONENTS "QtCore" "QtXml" "QtNetwork")
if( WITH_GUI )
list(APPEND NEEDED_QT4_COMPONENTS "QtGui")
endif()
- find_package(Qt4 REQUIRED COMPONENTS ${NEEDED_QT4_COMPONENTS})
- message(STATUS "Found Qt4 & ${NEEDED_QT4_COMPONENTS} modules")
+ find_package(Qt4 REQUIRED COMPONENTS ${NEEDED_QT4_COMPONENTS})
+ message(STATUS "Found Qt4 & ${NEEDED_QT4_COMPONENTS} modules")
macro(qt_use_modules)
endmacro()
@@ -178,13 +178,13 @@ if(NOT Qt5Core_FOUND)
qt4_add_translation(${ARGN})
endmacro()
- include(${QT_USE_FILE})
- add_definitions(${QT_DEFINITIONS})
+ include(${QT_USE_FILE})
+ add_definitions(${QT_DEFINITIONS})
- # On linux & using Qt4 we need to manually add -lX11
- if (UNIX AND NOT APPLE)
- list(APPEND VLMC_LIBS -lX11)
- endif()
+ # On linux & using Qt4 we need to manually add -lX11
+ if (UNIX AND NOT APPLE)
+ list(APPEND VLMC_LIBS -lX11)
+ endif()
endif()
# layout of VLMC installation
diff --git a/src/Backend/CMakeLists.txt b/src/Backend/CMakeLists.txt
index 79171ff..0fdf451 100644
--- a/src/Backend/CMakeLists.txt
+++ b/src/Backend/CMakeLists.txt
@@ -1,14 +1,13 @@
list(APPEND VLMC_SRCS
- IBackend.h
- IRenderer.h
- ISource.h
- VLC/VLCBackend.cpp
- VLC/VLCRenderer.cpp
- VLC/VLCSource.cpp
- VLC/LibVLCpp/VLCInstance.cpp
- VLC/LibVLCpp/VLCMedia.cpp
- VLC/LibVLCpp/VLCMediaPlayer.cpp
- VLC/LibVLCpp/VLCpp.hpp
- )
-
+ IBackend.h
+ IRenderer.h
+ ISource.h
+ VLC/VLCBackend.cpp
+ VLC/VLCRenderer.cpp
+ VLC/VLCSource.cpp
+ VLC/LibVLCpp/VLCInstance.cpp
+ VLC/LibVLCpp/VLCMedia.cpp
+ VLC/LibVLCpp/VLCMediaPlayer.cpp
+ VLC/LibVLCpp/VLCpp.hpp
+)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1b0c4d2..2d7a5ec 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,19 +6,19 @@
SET(VLMC_SRCS
Commands/Commands.cpp
- Backend/IBackend.h
- Backend/ISourceRenderer.h
- Backend/ISource.h
- Backend/VLC/EventWaiter.cpp
- Backend/VLC/VLCBackend.cpp
- Backend/VLC/VLCSourceRenderer.cpp
- Backend/VLC/VLCVmemRenderer.cpp
- Backend/VLC/VLCSource.cpp
- Backend/VLC/VLCMemorySource.cpp
- Backend/VLC/LibVLCpp/VLCInstance.cpp
- Backend/VLC/LibVLCpp/VLCMedia.cpp
- Backend/VLC/LibVLCpp/VLCMediaPlayer.cpp
- Backend/VLC/LibVLCpp/VLCpp.hpp
+ Backend/IBackend.h
+ Backend/ISourceRenderer.h
+ Backend/ISource.h
+ Backend/VLC/EventWaiter.cpp
+ Backend/VLC/VLCBackend.cpp
+ Backend/VLC/VLCSourceRenderer.cpp
+ Backend/VLC/VLCVmemRenderer.cpp
+ Backend/VLC/VLCSource.cpp
+ Backend/VLC/VLCMemorySource.cpp
+ Backend/VLC/LibVLCpp/VLCInstance.cpp
+ Backend/VLC/LibVLCpp/VLCMedia.cpp
+ Backend/VLC/LibVLCpp/VLCMediaPlayer.cpp
+ Backend/VLC/LibVLCpp/VLCpp.hpp
EffectsEngine/EffectsEngine.cpp
EffectsEngine/Effect.cpp
EffectsEngine/EffectUser.cpp
@@ -48,7 +48,7 @@ SET(VLMC_SRCS
Tools/ErrorHandler.cpp
Tools/MemoryPool.hpp
Tools/QSingleton.hpp
- Tools/RendererEventWatcher.cpp
+ Tools/RendererEventWatcher.cpp
Tools/Singleton.hpp
Tools/Toggleable.hpp
Tools/VlmcDebug.h
@@ -266,13 +266,13 @@ message(${FOUNDATION_FRAMEWORK})
ADD_EXECUTABLE( vlmc ${GUI_TYPE} ${VLMC_SRCS} ${VLMC_MOC_SRCS} ${VLMC_UIS_H} ${VLMC_RCC_SRCS} )
TARGET_LINK_LIBRARIES( vlmc ${VLMC_LIBS} )
- if (NOT Qt4_FOUND)
- qt_use_modules(vlmc Core Gui Widgets Xml Network)
- else()
- # We need to know the target for this one, which is not the case when doing most of the QT4/5 specific stuff.
- # We could hide this command in qt_use_modules macro, but this would be some kind of black magic uglyness
- TARGET_LINK_LIBRARIES(vlmc ${QT_LIBRARIES})
- endif()
+ if (NOT Qt4_FOUND)
+ qt_use_modules(vlmc Core Gui Widgets Xml Network)
+ else()
+ # We need to know the target for this one, which is not the case when doing most of the QT4/5 specific stuff.
+ # We could hide this command in qt_use_modules macro, but this would be some kind of black magic uglyness
+ TARGET_LINK_LIBRARIES(vlmc ${QT_LIBRARIES})
+ endif()
ENDIF( NOT WITH_GUI )
More information about the Vlmc-devel
mailing list