Am utorok 07 Jún 2011 schrieb Jean-Marc Lasgouttes: > Le 07/06/2011 09:01, Enrico Forestieri a écrit : > > The moc doesn't have a definition of QT_VERSION, so the check > > "#if QT_VERSION>= 0x040600" fails and you always get the "#else" > > clause. > > Here is my next try. Something similar will have to be done for cmake > and scons. > > JMarc
Cmake should be ready.
Kornel
Index: development/cmake/modules/LyXMacros.cmake
===================================================================
--- development/cmake/modules/LyXMacros.cmake (Revision 38972)
+++ development/cmake/modules/LyXMacros.cmake (Arbeitskopie)
@@ -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)
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt (Revision 38972)
+++ CMakeLists.txt (Arbeitskopie)
@@ -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")
signature.asc
Description: This is a digitally signed message part.
