]> git.lyx.org Git - features.git/commitdiff
Use decimal representation of QT_VERSION for moc-run in cmake build to match the...
authorKornel Benko <kornel@lyx.org>
Wed, 8 Jun 2011 23:00:28 +0000 (23:00 +0000)
committerKornel Benko <kornel@lyx.org>
Wed, 8 Jun 2011 23:00:28 +0000 (23:00 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38997 a592a061-630c-0410-9148-cb99ea01b6c8

CMakeLists.txt

index 1061c1bedc42b3c1c71625ed897e0def7fdd8642..032c12c53d55189e9ec85ef382df38381790ae8a 100644 (file)
@@ -618,8 +618,7 @@ 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}")
+       MATH(EXPR QT4_VERSION "(${CMAKE_MATCH_1}<<16)|(${CMAKE_MATCH_2}<<8)|${CMAKE_MATCH_3}")
 endif()
 
 add_subdirectory(src "${TOP_BINARY_DIR}/src")