anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use decimal representation of QT_VERSION for moc-run in cmake build to match the qglobal.h computation

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38997 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Kornel Benko 2011-06-08 23:00:28 +00:00
parent 20d3484075
commit cd861f10c5
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -618,8 +618,7 @@ configure_file(${LYX_CMAKE_DIR}/config.h.cmake ${TOP_BINARY_DIR}/config.h)
# Compute qt4-version from ${QTVERSION} # Compute qt4-version from ${QTVERSION}
if(QTVERSION MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+).*") if(QTVERSION MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+).*")
MATH(EXPR QT4_VERSIONNUM "${CMAKE_MATCH_1}*10000+${CMAKE_MATCH_2}*100+${CMAKE_MATCH_3}") MATH(EXPR QT4_VERSION "(${CMAKE_MATCH_1}<<16)|(${CMAKE_MATCH_2}<<8)|${CMAKE_MATCH_3}")
set(QT4_VERSION "0x${QT4_VERSIONNUM}")
endif() endif()
add_subdirectory(src "${TOP_BINARY_DIR}/src") add_subdirectory(src "${TOP_BINARY_DIR}/src")