Author: kornel
Date: Wed Jun 8 22:22:27 2011
New Revision: 38996
URL: http://www.lyx.org/trac/changeset/38996
Log:
Compile fix for Qt 4.5 and earlier.
Update for cmake build.
Modified:
lyx-devel/trunk/CMakeLists.txt
lyx-devel/trunk/development/cmake/modules/LyXMacros.cmake
Modified: lyx-devel/trunk/CMakeLists.txt
==============================================================================
--- lyx-devel/trunk/CMakeLists.txt Wed Jun 8 21:45:52 2011 (r38995)
+++ lyx-devel/trunk/CMakeLists.txt Wed Jun 8 22:22:27 2011 (r38996)
@@ -616,6 +616,11 @@
configure_file(${LYX_CMAKE_DIR}/config.h.cmake ${TOP_BINARY_DIR}/config.h)
+# Compute qt4-version from ${QTVERSION}
+if(QTVERSION MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+).*")
+ MATH(EXPR QT4_VERSIONNUM
"${CMAKE_MATCH_1}*10000+${CMAKE_MATCH_2}*100+${CMAKE_MATCH_3}")
+ set(QT4_VERSION "0x${QT4_VERSIONNUM}")
+endif()
add_subdirectory(src "${TOP_BINARY_DIR}/src")
add_subdirectory(lib/lyx2lyx "${TOP_BINARY_DIR}/lyx2lyx")
Modified: lyx-devel/trunk/development/cmake/modules/LyXMacros.cmake
==============================================================================
--- lyx-devel/trunk/development/cmake/modules/LyXMacros.cmake Wed Jun 8
21:45:52 2011 (r38995)
+++ lyx-devel/trunk/development/cmake/modules/LyXMacros.cmake Wed Jun 8
22:22:27 2011 (r38996)
@@ -108,7 +108,7 @@
#set(_moc ${_abs_PATH}/${_current_MOC})
add_custom_command(OUTPUT ${_moc}
COMMAND
${QT_MOC_EXECUTABLE}
- ARGS ${_def}
${_moc_INCS} ${_header} -o ${_moc}
+ ARGS
"-DQT_VERSION=${QT4_VERSION}" ${_def} ${_moc_INCS} ${_header} -o ${_moc}
MAIN_DEPENDENCY
${_header})
macro_add_file_dependencies(${_abs_FILE} ${_moc})
SET_SOURCE_FILES_PROPERTIES(${_moc}
GENERATED)
