Author: kornel
Date: Thu Jun 9 01:00:28 2011
New Revision: 38997
URL: http://www.lyx.org/trac/changeset/38997
Log:
Use decimal representation of QT_VERSION for moc-run in cmake build to match
the qglobal.h computation
Modified:
lyx-devel/trunk/CMakeLists.txt
Modified: lyx-devel/trunk/CMakeLists.txt
==============================================================================
--- lyx-devel/trunk/CMakeLists.txt Wed Jun 8 22:22:27 2011 (r38996)
+++ lyx-devel/trunk/CMakeLists.txt Thu Jun 9 01:00:28 2011 (r38997)
@@ -618,8 +618,7 @@
# 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}")
+ MATH(EXPR QT4_VERSION
"(${CMAKE_MATCH_1}<<16)|(${CMAKE_MATCH_2}<<8)|${CMAKE_MATCH_3}")
endif()
add_subdirectory(src "${TOP_BINARY_DIR}/src")
