From e9d7e3eca60c8945a3688ddb55574dd7abe9597e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20G=C3=A2teau?= <agateau@kde.org>
Date: Fri, 27 Jun 2014 15:41:55 +0200
Subject: [PATCH] Use Qt5 cmake macros
The qt_* macros have a different signature
---
CalamaresAddLibrary.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CalamaresAddLibrary.cmake b/CalamaresAddLibrary.cmake
index a7666b8eb2..6a57f6ccf6 100644
--- a/CalamaresAddLibrary.cmake
+++ b/CalamaresAddLibrary.cmake
@@ -25,13 +25,13 @@ function(calamares_add_library)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
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})
endif()
# add resources from current dir
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})
unset(LIBRARY_RC_SOURCES)
endif()
--
GitLab