Commit 87c88c5f authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

CMake: remove tabs and trailing spaces

parent 15239324
......@@ -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
......
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
)
......@@ -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 )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment