[vlmc-devel] commit: CMake: Renaming VLMC_HDRS to VLMC_MOD_HDRS. ( Hugo Beauzée-Luyssen )
git at videolan.org
git at videolan.org
Thu Oct 7 15:03:00 CEST 2010
vlmc | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Tue Oct 5 01:04:11 2010 +0200| [9bc8b8d4dc5b54a16d032c6ad682221e76285341] | committer: Hugo Beauzée-Luyssen
CMake: Renaming VLMC_HDRS to VLMC_MOD_HDRS.
In a few commits, a new list will contain non-moc headers, so all the
headers can be packaged (let's say in a source tarball for instance)
> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=9bc8b8d4dc5b54a16d032c6ad682221e76285341
---
src/CMakeLists.txt | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b2d99ad..b68ba7d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -60,7 +60,7 @@ ELSE (WIN32)
LIST( APPEND VLMC_SRCS Main/vlmc.cpp )
ENDIF(WIN32)
-SET (VLMC_HDRS
+SET (VLMC_MOC_HDRS
EffectsEngine/EffectHelper.h
EffectsEngine/EffectUser.h
EffectsEngine/EffectsEngine.h
@@ -142,9 +142,9 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/config.h.cmake ${CMAKE_CURRENT_BINARY_D
IF (NOT WITH_GUI)
LIST (APPEND VLMC_SRCS Main/main.cpp Renderer/ConsoleRenderer.cpp )
- LIST (APPEND VLMC_HDRS Renderer/ConsoleRenderer.h)
+ LIST (APPEND VLMC_MOC_HDRS Renderer/ConsoleRenderer.h)
QT4_ADD_RESOURCES(VLMC_RCC_SRCS ${VLMC_RCC})
- QT4_WRAP_CPP(VLMC_MOC_SRCS ${VLMC_HDRS})
+ QT4_WRAP_CPP(VLMC_MOC_SRCS ${VLMC_MOC_HDRS})
ADD_EXECUTABLE(vlmc ${GUI_TYPE} ${VLMC_SRCS} ${VLMC_MOC_SRCS} ${VLMC_RCC_SRCS})
TARGET_LINK_LIBRARIES(vlmc ${VLMC_LIBS})
@@ -221,7 +221,7 @@ ELSE(NOT WITH_GUI)
Media/Transcoder.cpp #Won't be needed without the import, so let's put it in GUI list
)
- LIST( APPEND VLMC_HDRS
+ LIST( APPEND VLMC_MOC_HDRS
Commands/KeyboardShortcutHelper.h
Gui/About.h
Gui/ClipProperty.h
@@ -325,13 +325,13 @@ ELSE(NOT WITH_GUI)
ELSE ( CMAKE_SYSTEM_NAME STREQUAL "Linux" )
LIST( APPEND VLMC_SRCS Tools/Win32BacktraceGenerator.cpp )
ENDIF( CMAKE_SYSTEM_NAME STREQUAL "Linux" )
- LIST( APPEND VLMC_HDRS Gui/widgets/CrashHandler.h )
+ LIST( APPEND VLMC_MOC_HDRS Gui/widgets/CrashHandler.h )
LIST( APPEND VLMC_UIS Gui/widgets/ui/CrashHandler.ui )
ENDIF(WITH_CRASHHANDLER_GUI)
QT4_WRAP_UI(VLMC_UIS_H ${VLMC_UIS})
QT4_ADD_RESOURCES(VLMC_RCC_SRCS ${VLMC_RCC})
- QT4_WRAP_CPP(VLMC_MOC_SRCS ${VLMC_HDRS})
+ QT4_WRAP_CPP(VLMC_MOC_SRCS ${VLMC_MOC_HDRS})
IF( MINGW )
# resource compilation for MinGW
More information about the Vlmc-devel
mailing list