Added more hints in the tests.

Fixed the include script for LibSqlCipher.

Author: blizzard4591

CMakeLists.txt

@@ -15,17 +15,6 @@ if (NOT WIN32)
 	find_package(PkgConfig REQUIRED)
 	pkg_check_modules(SQLCIPHER REQUIRED sqlcipher)
 else()
-	if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-		set(_lib_suffix_win "x64")
-	else()
-		set(_lib_suffix_win "x86")
-	endif()
-
-	# Change this by hand if needed
-	set(Libsqlcipher_INCLUDE_DIRS "C:/CppProjects/sqlcipher/include")
-	# Change this by hand if needed
-	set(Libsqlcipher_LIBRARIES "optimized;C:/CppProjects/sqlcipher/compile/${_lib_suffix_win}/Release/sqlite3.lib;debug;C:/CppProjects/sqlcipher/compile/${_lib_suffix_win}/Debug/sqlite3.lib")
-
 	find_package(Libsqlcipher REQUIRED)
 endif()
 
@@ -108,7 +97,7 @@ add_library(qsqlcipher ${LIBTYPE}
 
 target_include_directories(qsqlcipher PRIVATE
     ${Qt5Sql_PRIVATE_INCLUDE_DIRS}
-    ${SQLCIPHER_INCLUDE_DIRS} ${Libsqlcipher_INCLUDE_DIRS}
+    ${SQLCIPHER_INCLUDE_DIRS} ${Libsqlcipher_INCLUDE_DIRS}/sqlcipher
 )
 
 target_link_libraries(qsqlcipher

cmake/FindLibsqlcipher.cmake

@@ -26,8 +26,14 @@ find_path(Libsqlcipher_INCLUDE_DIRS sqlcipher/sqlite3.h
 	/usr
 	/opt/local
 	/opt
+	${Libsqlcipher_INCLUDE_DIRS}
 )
 
+if(NOT EXISTS "${Libsqlcipher_INCLUDE_DIRS}/sqlcipher/sqlite3.h")
+	message(SEND_ERROR "Could not find LibSqlCipher Include directory for Libsqlcipher_INCLUDE_DIRS, it should contain sqlcipher/sqlite3.h! Tried: \"${Libsqlcipher_INCLUDE_DIRS}\"")
+	set(Libsqlcipher_INCLUDE_DIRS "")
+endif()
+
 if(CMAKE_SIZEOF_VOID_P EQUAL 8)
 	set(_lib_suffix 64)
 	set(_lib_suffix_win "x64")

test-shared/main.cpp

@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
 	// QSQLCIPHER
 	{
 #if defined(_WIN32) || defined(_WIN64) || defined(_MSC_VER )
-		std::cout << "Hint: If you get an error in the following task like \"QSQLCIPHER driver not loaded\" then check if library dependencies (e.g. libeay32.dll) are in the same folder as the test executable." << std::endl;
+		std::cout << "Hint: If you get an error in the following task like \"QSQLCIPHER driver not loaded\" then check if library dependencies (e.g. libssl32.dll and sqlite3.dll from SQLCipher) are in the same folder as the test executable." << std::endl;
 #endif
 		std::cout << "Running Task 4..." << std::endl;
 		// Check that SQLCipher is not SQLite
@@ -75,7 +75,8 @@ int main(int argc, char *argv[])
 		withDB("QSQLCIPHER", [](auto db){
 			std::cout << "Running Task 5.1..." << std::endl;
 			db.exec("PRAGMA key = 'foobar';");
-			std::cout << "Running Task 5.2... (this might trigger a segfault)" << std::endl;
+			std::cout << "Hint: The next test might trigger a segfault when SQLCipher is linked against an incompatible version of OpenSSL or comes with the broken compatibility patch for OpenSSL 1.1.x." << std::endl;
+			std::cout << "Running Task 5.2..." << std::endl;
 			db.exec("CREATE TABLE `foo` (`bar`	INTEGER);");
 			std::cout << "Running Task 5.3..." << std::endl;
 			db.exec("INSERT INTO `foo` VALUES (42);");