diff options
author | Markus Goetz <markus@woboq.com> | 2015-10-20 14:00:55 +0300 |
---|---|---|
committer | Markus Goetz <markus@woboq.com> | 2015-10-20 14:04:33 +0300 |
commit | 4c9bc42b694121f2691ed4b9224892ebfbe10934 (patch) | |
tree | 9adca5d67eeaf29e9a89cb3a72710b8b8db75319 | |
parent | d09de794917f14601542ca7b6befb4bf71de44e6 (diff) |
Revert libqsqlite changes for nowv2.0.2-rc2
QtWebKit depends on it unfortunately
-rw-r--r-- | cmake/modules/NSIS.template.in | 5 | ||||
-rw-r--r-- | src/cmd/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/gui/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/libsync/CMakeLists.txt | 2 | ||||
-rw-r--r-- | test/owncloud_add_test.cmake | 2 |
5 files changed, 10 insertions, 5 deletions
diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in index 5dd9cde95..98d5a3df6 100644 --- a/cmake/modules/NSIS.template.in +++ b/cmake/modules/NSIS.template.in @@ -403,6 +403,9 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION File "${IMAGEFORMATS_DLL_PATH}\qjpeg.dll" File "${IMAGEFORMATS_DLL_PATH}\qico.dll" + SetOutPath "$INSTDIR\sqldrivers" + File "${SQLITE_DLL_PATH}\qsqlite.dll" + SetOutPath "$INSTDIR" ;License & release notes. File "@CPACK_RESOURCE_FILE_LICENSE@" @@ -416,6 +419,7 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION File "${QT_DLL_PATH}\Qt5PrintSupport.dll" File "${QT_DLL_PATH}\Qt5Qml.dll" File "${QT_DLL_PATH}\Qt5Quick.dll" + File "${QT_DLL_PATH}\Qt5Sql.dll" File "${QT_DLL_PATH}\Qt5WebKit.dll" File "${QT_DLL_PATH}\Qt5WebKitWidgets.dll" File "${QT_DLL_PATH}\Qt5Widgets.dll" @@ -443,6 +447,7 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION File "${MING_BIN}\libxslt-1.dll" File "${MING_BIN}\libxml2-2.dll" File "${MING_BIN}\zlib1.dll" + File "${MING_BIN}\libsqlite3-0.dll" ;QtKeyChain stuff File "${MING_BIN}\libqt5keychain.dll" diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt index d4a842063..caea5ce89 100644 --- a/src/cmd/CMakeLists.txt +++ b/src/cmd/CMakeLists.txt @@ -19,7 +19,7 @@ include_directories(${CMAKE_SOURCE_DIR}/csync/src if(NOT BUILD_LIBRARIES_ONLY) add_executable(${cmd_NAME} ${cmd_SRC}) - qt5_use_modules(${cmd_NAME} Network) + qt5_use_modules(${cmd_NAME} Network Sql) set_target_properties(${cmd_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} ) set_target_properties(${cmd_NAME} PROPERTIES diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 51a927b4f..a892ab1f2 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -227,14 +227,14 @@ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE) # add_executable( ${APPLICATION_EXECUTABLE} main.cpp ${final_src}) add_executable( ${APPLICATION_EXECUTABLE} WIN32 main.cpp ${final_src}) - qt5_use_modules(${APPLICATION_EXECUTABLE} Widgets Network Xml WebKitWidgets ${ADDITIONAL_APP_MODULES}) + qt5_use_modules(${APPLICATION_EXECUTABLE} Widgets Network Xml WebKitWidgets Sql ${ADDITIONAL_APP_MODULES}) else() # set(CMAKE_INSTALL_PREFIX ".") # Examples use /Applications. hurmpf. set(MACOSX_BUNDLE_ICON_FILE "ownCloud.icns") # we must add MACOSX_BUNDLE only if building a bundle add_executable( ${APPLICATION_EXECUTABLE} WIN32 MACOSX_BUNDLE main.cpp ${final_src}) - qt5_use_modules(${APPLICATION_EXECUTABLE} Widgets Network Xml WebKitWidgets ${ADDITIONAL_APP_MODULES}) + qt5_use_modules(${APPLICATION_EXECUTABLE} Widgets Network Xml WebKitWidgets Sql ${ADDITIONAL_APP_MODULES}) set (QM_DIR ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/Translations) install(FILES ${client_I18N} DESTINATION ${QM_DIR}) diff --git a/src/libsync/CMakeLists.txt b/src/libsync/CMakeLists.txt index a3704a3ad..26b012ca9 100644 --- a/src/libsync/CMakeLists.txt +++ b/src/libsync/CMakeLists.txt @@ -168,7 +168,7 @@ endif() if(BUILD_LIBRARIES_ONLY) #add_library(${synclib_NAME}_static STATIC ${libsync_SRCS} ${syncMoc}) - #qt5_use_modules(${synclib_NAME}_static Widgets Network Xml) + #qt5_use_modules(${synclib_NAME}_static Widgets Network Xml Sql) #set_target_properties( ${synclib_NAME}_static PROPERTIES # VERSION ${MIRALL_VERSION} diff --git a/test/owncloud_add_test.cmake b/test/owncloud_add_test.cmake index 154c75981..d1a67f16b 100644 --- a/test/owncloud_add_test.cmake +++ b/test/owncloud_add_test.cmake @@ -14,7 +14,7 @@ macro(owncloud_add_test test_class additional_cpp) qt_wrap_cpp(test${OWNCLOUD_TEST_CLASS_LOWERCASE}.h) add_executable(${OWNCLOUD_TEST_CLASS}Test test${OWNCLOUD_TEST_CLASS_LOWERCASE}.cpp ${additional_cpp}) - qt5_use_modules(${OWNCLOUD_TEST_CLASS}Test Test Xml Network Gui Widgets) + qt5_use_modules(${OWNCLOUD_TEST_CLASS}Test Test Sql Xml Network Gui Widgets) target_link_libraries(${OWNCLOUD_TEST_CLASS}Test updater |