- Use simple approach to data dir. Current setup of code not allows both
authorHelio Chissini de Castro <helio@kde.org>
Fri, 19 Dec 2014 18:36:59 +0000 (16:36 -0200)
committerHelio Chissini de Castro <helio@kde.org>
Fri, 19 Dec 2014 18:36:59 +0000 (16:36 -0200)
  qt4 and qt5 cohexists, and data files are same for both libraries.
  If a different data dir is required for specifics reason, is possible
  to set in cmake run -DLXQT_LIBRARY_NAME:STRING="string"

Signed-off-by: Helio Chissini de Castro <helio@kde.org>
CMakeLists.txt

index 4533e4c..e5f78fa 100644 (file)
@@ -149,7 +149,6 @@ QT5_ADD_DBUS_ADAPTOR(SRCS
 )
 
 set(LXQT_QT_VERSION "5")
-set(LXQT_QT_VERSION_SUFFIX "-qt5")
 
 # KF5WindowSystem is missing here. KF5WindowSystem doesn't provide an .pc file.
 set(LXQT_PKG_CONFIG_REQUIRES "Qt5Widgets Qt5Xml Qt5DBus Qt5X11Extras")
@@ -164,7 +163,7 @@ include_directories(
 include(GNUInstallDirs)
 
 set(LXQT_VERSION ${LXQT_MAJOR_VERSION}.${LXQT_MINOR_VERSION}.${LXQT_PATCH_VERSION})
-set(LXQT_LIBRARY_NAME "lxqt${LXQT_QT_VERSION_SUFFIX}")
+set(LXQT_LIBRARY_NAME "lxqt" CACHE STRING "lxqt")
 set(LXQT_RELATIVE_SHARE_DIR "${LXQT_LIBRARY_NAME}")
 set(LXQT_SHARE_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/${LXQT_RELATIVE_SHARE_DIR}")
 set(LXQT_RELATIVE_TRANSLATIONS_DIR "${LXQT_LIBRARY_NAME}/translations")