From kde-commits Thu Apr 30 22:06:12 2015 From: Guillaume de Bure Date: Thu, 30 Apr 2015 22:06:12 +0000 To: kde-commits Subject: [skrooge/kf5] /: Fix Qt Plugins location by relying on QT_PLUGIN_INSTALL_DIR Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=143043158215797 Git commit 76c8dbedd8840da2a1f3e5a635b28d4fa0da5276 by Guillaume de Bure. Committed on 30/04/2015 at 22:04. Pushed by gdebure into branch 'kf5'. Fix Qt Plugins location by relying on QT_PLUGIN_INSTALL_DIR M +0 -4 CMakeLists.txt http://commits.kde.org/skrooge/76c8dbedd8840da2a1f3e5a635b28d4fa0da5276 diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ef87c1..cae72ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,10 +88,6 @@ ELSE (CMAKE_BUILD_TYPE) #"none": the build flags are manually set using the CMAKE_CXX_FLAGS option. ENDIF (CMAKE_BUILD_TYPE) = -IF (IS_DIRECTORY QT_PLUGIN_INSTALL_DIR) -ELSE (IS_DIRECTORY QT_PLUGIN_INSTALL_DIR) - SET(QT_PLUGIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/${QT_PLUGIN_INSTALL_= DIR}/../qt5/plugins/) -ENDIF (IS_DIRECTORY QT_PLUGIN_INSTALL_DIR) MESSAGE( STATUS " QT_PLUGIN_INSTALL_DIR : " ${QT_PLUGIN_INSTALL_DIR}) = FIND_PROGRAM(SKG_BASH bash)