qesteidutil-0.3.0-system_qtsingleapplication.patch

   1 Index: CMakeLists.txt
   2 ===================================================================
   3 --- CMakeLists.txt      (revision 3226)
   4 +++ CMakeLists.txt      (revision 3227)
   5 @@ -25,6 +25,18 @@
   6      add_definitions(-D_SECURE_SCL=0)
   7  endif(MSVC)
   8
   9 +# try to find system copy of qtsingleapplication
  10 +find_path(QTSINGLEAPPLICATION_INCLUDE_DIRS qtsingleapplication.h PATH_SUFFIXES QtSolutions)
  11 +find_library(QTSINGLEAPPLICATION_LIBRARIES QtSolutions_SingleApplication-2.6)
  12 +if(QTSINGLEAPPLICATION_INCLUDE_DIRS AND QTSINGLEAPPLICATION_LIBRARIES)
  13 +    message(STATUS "Found QtSingleApplication: ${QTSINGLEAPPLICATION_LIBRARIES}")
  14 +else()
  15 +    message(STATUS "QtSingleApplication not found; using bundled copy")
  16 +    add_subdirectory(qtsingleapplication)
  17 +    set(QTSINGLEAPPLICATION_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/qtsingleapplication/src)
  18 +    set(QTSINGLEAPPLICATION_LIBRARIES qtsingleapplication)
  19 +endif()
  20 +
  21  set(QT_USE_QTNETWORK true)
  22  set(QT_USE_QTWEBKIT true)
  23  set(QT_USE_QTXML true)
  24 @@ -99,8 +111,6 @@
  25
  26  include(${QT_USE_FILE})
  27
  28 -add_subdirectory( qtsingleapplication )
  29 -
  30  find_package(Subversion)
  31  if (Subversion_FOUND AND EXISTS ${PROJECT_SOURCE_DIR}/.svn)
  32    Subversion_WC_INFO(${PROJECT_SOURCE_DIR} PROJECT)
  33 @@ -113,10 +123,10 @@
  34  include_directories(
  35      ${CMAKE_SOURCE_DIR}
  36      ${CMAKE_BINARY_DIR}
  37 +    ${LIBP11_INCLUDE_DIR}
  38      ${OPENSSL_INCLUDE_DIR}
  39 -    ${LIBP11_INCLUDE_DIR}
  40 +    ${QTSINGLEAPPLICATION_INCLUDE_DIRS}
  41      ${SMARTCARDPP_INCLUDE_DIR}
  42 -    qtsingleapplication/src
  43  )
  44
  45  if(APPLE)
  46 @@ -170,13 +180,13 @@
  47  target_link_libraries(qesteidutil
  48      ${QT_QTMAIN_LIBRARY}
  49      ${QT_LIBRARIES}
  50 +    ${LIBP11_LIBRARIES}
  51      ${OPENSSL_LIBRARIES}
  52      ${OPENSSLCRYPTO_LIBRARIES}
  53 -    ${LIBP11_LIBRARIES}
  54 +    ${QTSINGLEAPPLICATION_LIBRARIES}
  55      ${SMARTCARDPP_LIBRARIES}
  56 -       ${WIN_LIBRARIES}
  57 +    ${WIN_LIBRARIES}
  58      ${CARBON_LIBRARY}
  59 -    qtsingleapplication
  60  )
  61
  62  if(UNIX AND NOT APPLE)