mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-22 05:16:21 +00:00
Use decimal representation of QT_VERSION for moc-run in cmake build to match the qglobal.h computation
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38997 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
20d3484075
commit
cd861f10c5
@ -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")
|
||||
|
Loading…
Reference in New Issue
Block a user