fix installation paths for sql drivers

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/sql/drivers/ibase/ibase.cmake b/src/sql/drivers/ibase/ibase.cmake
index fb966c9..7b6aef0 100644 (file)
--- a/src/sql/drivers/ibase/ibase.cmake
+++ b/src/sql/drivers/ibase/ibase.cmake
@@ -28,13 +28,12 @@ set(EXTRA_SQL_LIBS
     ${EXTRA_IBASEDRIVERS_LIBS}
 )
 
-katie_resources("${IBASEDRIVER_SOURCES}")
-katie_resources("${IBASEDRIVER_HEADERS}")
+katie_resources(${IBASEDRIVER_SOURCES} ${IBASEDRIVER_HEADERS})
 
 add_library(qsqlibase ${KATIE_TYPE} ${IBASEDRIVER_SOURCES} ${IBASEDRIVER_HEADERS})
 target_link_libraries(qsqlibase KtSql ${EXTRA_IBASEDRIVER_LIBS})
 
 install(
     TARGETS qsqlibase
-    DESTINATION ${QT_PLUGINS_PATH_INST}/sqldrivers
+    DESTINATION ${QT_PLUGINS_PATH}/sqldrivers
 )

diff --git a/src/sql/drivers/mysql/mysql.cmake b/src/sql/drivers/mysql/mysql.cmake
index c872f9a..1ebf2e9 100644 (file)
--- a/src/sql/drivers/mysql/mysql.cmake
+++ b/src/sql/drivers/mysql/mysql.cmake
@@ -11,13 +11,12 @@ set(MYSQLCDRIVER_SOURCES
 
 include_directories(${MYSQL_INCLUDES})
 
-katie_resources("${MYSQLCDRIVER_SOURCES}")
-katie_resources("${MYSQLCDRIVER_HEADERS}")
+katie_resources(${MYSQLCDRIVER_SOURCES} ${MYSQLCDRIVER_HEADERS})
 
 add_library(qsqlmysql ${KATIE_TYPE} ${MYSQLCDRIVER_SOURCES} ${MYSQLCDRIVER_HEADERS})
 target_link_libraries(qsqlmysql KtSql ${MYSQL_LIBRARIES})
 
 install(
     TARGETS qsqlmysql
-    DESTINATION ${QT_PLUGINS_PATH_INST}/sqldrivers
+    DESTINATION ${QT_PLUGINS_PATH}/sqldrivers
 )

diff --git a/src/sql/drivers/odbc/odbc.cmake b/src/sql/drivers/odbc/odbc.cmake
index c536057..ba7eb6e 100644 (file)
--- a/src/sql/drivers/odbc/odbc.cmake
+++ b/src/sql/drivers/odbc/odbc.cmake
@@ -15,13 +15,12 @@ endif()
 
 include_directories(${ODBC_INCLUDES})
 
-katie_resources("${ODBCDRIVER_SOURCES}")
-katie_resources("${ODBCDRIVER_HEADERS}")
+katie_resources(${ODBCDRIVER_SOURCES} ${ODBCDRIVER_HEADERS})
 
 add_library(qsqlodbc ${KATIE_TYPE} ${ODBCDRIVER_SOURCES} ${ODBCDRIVER_HEADERS})
 target_link_libraries(qsqlodbc KtSql ${ODBC_LIBRARIES})
 
 install(
     TARGETS qsqlodbc
-    DESTINATION ${QT_PLUGINS_PATH_INST}/sqldrivers
+    DESTINATION ${QT_PLUGINS_PATH}/sqldrivers
 )

diff --git a/src/sql/drivers/psql/psql.cmake b/src/sql/drivers/psql/psql.cmake
index b83b48c..9a61e13 100644 (file)
--- a/src/sql/drivers/psql/psql.cmake
+++ b/src/sql/drivers/psql/psql.cmake
@@ -11,13 +11,12 @@ set(PSQLDRIVER_SOURCES
 
 include_directories(${PostgreSQL_INCLUDE_DIRS})
 
-katie_resources("${PSQLDRIVER_SOURCES}")
-katie_resources("${PSQLDRIVER_HEADERS}")
+katie_resources(${PSQLDRIVER_SOURCES} ${PSQLDRIVER_HEADERS})
 
 add_library(qsqlpsql ${KATIE_TYPE} ${PSQLDRIVER_SOURCES} ${PSQLDRIVER_HEADERS})
 target_link_libraries(qsqlpsql KtSql ${PostgreSQL_LIBRARIES})
 
 install(
     TARGETS qsqlpsql
-    DESTINATION ${QT_PLUGINS_PATH_INST}/sqldrivers
+    DESTINATION ${QT_PLUGINS_PATH}/sqldrivers
 )

diff --git a/src/sql/drivers/sqlite/sqlite.cmake b/src/sql/drivers/sqlite/sqlite.cmake
index ababc46..7e23783 100644 (file)
--- a/src/sql/drivers/sqlite/sqlite.cmake
+++ b/src/sql/drivers/sqlite/sqlite.cmake
@@ -19,8 +19,7 @@ else()
     include_directories(${CMAKE_SOURCE_DIR}/src/3rdparty/sqlite3)
 endif()
 
-katie_resources("${SQLDRIVER_SOURCES}")
-katie_resources("${SQLDRIVER_HEADERS}")
+katie_resources(${SQLDRIVER_SOURCES} ${SQLDRIVER_HEADERS})
 
 add_library(qsqlite ${KATIE_TYPE} ${SQLDRIVER_SOURCES} ${SQLDRIVER_HEADERS})
 if(SQLITE_FOUND)
@@ -31,5 +30,5 @@ endif()
 
 install(
     TARGETS qsqlite
-    DESTINATION ${QT_PLUGINS_PATH_INST}/sqldrivers
+    DESTINATION ${QT_PLUGINS_PATH}/sqldrivers
 )