@@ -111,8 +111,18 @@ if (NOT ("${QSQLCIPHER_COPYTO_DIR}" STREQUAL ""))
111111 add_custom_command (TARGET qsqlcipher POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:qsqlcipher> ${QSQLCIPHER_COPYTO_DIR} /$<TARGET_FILE_NAME:qsqlcipher>)
112112endif ()
113113
114+ find_program (DPKG_PROGRAM dpkg DOC "dpkg program of Debian-based systems" )
114115if (NOT WIN32 )
115- INSTALL (TARGETS qsqlcipher DESTINATION lib/qt5/plugins/sqldrivers)
116+ if (DPKG_PROGRAM)
117+ if (CMAKE_SIZEOF_VOID_P EQUAL 8)
118+ INSTALL (TARGETS qsqlcipher DESTINATION lib/x86_64-linux-gnu/qt5/plugins/sqldrivers)
119+ else ()
120+ INSTALL (TARGETS qsqlcipher DESTINATION lib/i386-linux-gnu/qt5/plugins/sqldrivers)
121+ endif ()
122+ else ()
123+ message (WARNING "Packaging is not set up for this platform, either submit a ticket or change/add pathes yourself, if packaging is required." )
124+ INSTALL (TARGETS qsqlcipher DESTINATION sqldrivers)
125+ endif ()
116126else ()
117127 INSTALL (TARGETS qsqlcipher DESTINATION sqldrivers)
118128endif ()
128138
129139SET (CPACK_PACKAGE_VERSION_MAJOR "0" )
130140SET (CPACK_PACKAGE_VERSION_MINOR "1" )
131- SET (CPACK_PACKAGE_VERSION_PATCH "0 " )
132- SET (CPACK_PACKAGE_VERSION_REVISION "5 " )
141+ SET (CPACK_PACKAGE_VERSION_PATCH "1 " )
142+ SET (CPACK_PACKAGE_VERSION_REVISION "1 " )
133143SET (CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR} .${CPACK_PACKAGE_VERSION_MINOR} .${CPACK_PACKAGE_VERSION_PATCH} " )
134144
135- find_program (DPKG_PROGRAM dpkg DOC "dpkg program of Debian-based systems" )
136145if (DPKG_PROGRAM)
137146 execute_process (COMMAND ${DPKG_PROGRAM} --print-architecture OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE)
138147 SET (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME} _${CPACK_PACKAGE_VERSION} -${CPACK_PACKAGE_VERSION_REVISION} _${CPACK_DEBIAN_PACKAGE_ARCHITECTURE} " )
0 commit comments