From d891032219c3faaa13a9d9a4d52659866e6773da Mon Sep 17 00:00:00 2001 From: Orochimarufan Date: Thu, 21 Feb 2013 21:55:35 +0100 Subject: [PATCH] use QtCreator's $QTPATH in CMake --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 88e7e4d4..86619f0d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -264,6 +264,10 @@ ADD_DEPENDENCIES(MultiMC MultiMCLauncher libmmcutil libmmcsettings libmmcinst) ################################ INSTALLATION AND PACKAGING ################################ +# use QtCreator's QTDIR var +IF(DEFINED ENV{QTDIR}) + SET(Qt5_DIR $ENV{QTDIR}) +ENDIF() ######## Plugin and library folders ######## @@ -280,7 +284,7 @@ ENDIF() IF(APPLE) SET(PLUGIN_DEST_DIR MultiMC.app/Contents/MacOS) SET(QTCONF_DEST_DIR MultiMC.app/Contents/Resources) - SET(APPS "\${CMAKE_INSTALL_PREFIX}/MultiMC.app") + SET(APPS "\${CMAKE_INSTALL_PREFIX}/MultiMC.app") ENDIF() SET(QT_PLUGINS_DIR ${Qt5_DIR}/plugins)