napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use Qt5 cmake macros

Browse Source 
The qt_* macros have a different signature
This commit is contained in:
Aurélien Gâteau 2014-06-27 15:41:55 +02:00
parent f4c5b90472
commit e9d7e3eca6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CalamaresAddLibrary.cmake
View File

@ -25,13 +25,13 @@ function(calamares_add_library)
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
if(LIBRARY_UI) if(LIBRARY_UI)
qt_wrap_ui(LIBRARY_UI_SOURCES ${LIBRARY_UI}) qt5_wrap_ui(LIBRARY_UI_SOURCES ${LIBRARY_UI})
list(APPEND LIBRARY_SOURCES ${LIBRARY_UI_SOURCES}) list(APPEND LIBRARY_SOURCES ${LIBRARY_UI_SOURCES})
endif() endif()
# add resources from current dir # add resources from current dir
if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/resources.qrc") if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/resources.qrc")
qt_add_resources(LIBRARY_RC_SOURCES "resources.qrc") qt5_add_resources(LIBRARY_RC_SOURCES "resources.qrc")
list(APPEND LIBRARY_SOURCES ${LIBRARY_RC_SOURCES}) list(APPEND LIBRARY_SOURCES ${LIBRARY_RC_SOURCES})
unset(LIBRARY_RC_SOURCES) unset(LIBRARY_RC_SOURCES)
endif() endif()