Merge branch 'qt5'
authorLuís Pereira <luis.artur.pereira@gmail.com>
Sat, 31 May 2014 16:37:10 +0000 (09:37 -0700)
committerLuís Pereira <luis.artur.pereira@gmail.com>
Sat, 31 May 2014 16:37:10 +0000 (09:37 -0700)
* qt5: (21 commits)
  Don't allow #include <lxqt-qt5/lxqtxxxxx.h>
  Updates the Qt4 and Qt5 library names and related stuff
  Use the same header namespace everywhere
  Don't use undefined variables
  Find liblxqt dependencies automatically
  Removes another duplicated installation of a file
  Removes duplicate installation of a file
  Fixes extra misleading slashes in path names
  Cleans commented unneeded stuff
  Fix a typo in variable name
  Fix broken build of qt4 version
  Use more portable Qt and qtxdg header names
  Use newer version of cmake 2.8.9
  Detect the path of qmake correctly for Qt5.
  Fix internal include
  Fix after merging from master, by removing dupplicated items
  Merge branch 'master' of https://github.com/lxde/liblxqt into qt5
  Update qt5 porting
  Use cmake export functionality.
  Qt5 support (step 1)
  ...

Conflicts:
CMakeLists.txt
cmake/lxqt-config.cmake.in

Signed-off-by: Luís Pereira <luis.artur.pereira@gmail.com>
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
@@@ -213,20 -335,37 +335,38 @@@ set_target_properties(${LXQT_LIBRARY_NA
      SOVERSION ${LXQT_MAJOR_VERSION}
  )
  
- install(TARGETS lxqt DESTINATION ${LIB_INSTALL_DIR})
- install(FILES ${PUB_HDRS}  DESTINATION ${LXQT_INCLUDE_DIR})
- install(FILES ${PORTABLE_HEADERS} DESTINATION ${LXQT_INCLUDE_DIR})
+ install(TARGETS 
+     ${LXQT_LIBRARY_NAME} 
+     DESTINATION ${CMAKE_INSTALL_LIBDIR} 
+     EXPORT ${LXQT_LIBRARY_NAME}-targets
+     LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
+ )
+ export(TARGETS ${LXQT_LIBRARY_NAME} ${QTXDG_TARGET} FILE ${LXQT_INTREE_TARGETS_FILE})
+ install(FILES ${PUB_HDRS}                DESTINATION ${LXQT_INSTALL_INCLUDE_DIR}/LXQt)
+ if (USE_QT4)
+     install(FILES ${PUB_HDRS}   DESTINATION ${LXQT_INSTALL_INCLUDE_DIR})
+ endif()
+ install(FILES ${INTREE_PORTABLE_HEADERS} DESTINATION ${LXQT_INSTALL_INCLUDE_DIR}/LXQt)
  install(FILES ${QM_FILES} DESTINATION ${LXQT_TRANSLATIONS_DIR})
  
- install(FILES
-     ${CMAKE_CURRENT_BINARY_DIR}/lxqt-config.cmake
-     DESTINATION share/cmake/lxqt
+ #************************************************
+ # Create pkgconfig file
+ #************************************************
+ lxqt_create_pkgconfig_file(${LXQT_LIBRARY_NAME}
+     ${LXQT_PKG_CONFIG_DESCRIPTION}
+     ${LXQT_PKG_CONFIG_REQUIRES}
+     ${LXQT_LIBRARY_NAME}
+     ${LXQT_VERSION}
  )
- install(FILES cmake/lxqt_use.cmake DESTINATION share/cmake/lxqt)
+ #************************************************
  
- include(cmake/create_pkgconfig_file.cmake)
- create_pkgconfig_file(lxqt "Shared library for LXQt applications")
 +
  # building tarball with CPack -------------------------------------------------
  include (InstallRequiredSystemLibraries)
  set (CPACK_PACKAGE_VERSION_MAJOR ${LXQT_MAJOR_VERSION})