From 1cc7c7541d1725ee35022b4774cc896b01b6f26d Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 14 May 2008 00:59:43 +0200 Subject: [PATCH 1/4] Fix testsetup for journal query test. --- tests/csync_tests/check_csync_journal_query.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/csync_tests/check_csync_journal_query.c b/tests/csync_tests/check_csync_journal_query.c index d93d54f88..1fc93c235 100644 --- a/tests/csync_tests/check_csync_journal_query.c +++ b/tests/csync_tests/check_csync_journal_query.c @@ -1,3 +1,4 @@ +/* Last Change: 2008-05-14 00:59:10 */ #define _GNU_SOURCE /* asprintf */ #include @@ -12,7 +13,9 @@ const char *testtmpdb = (char *) "/tmp/check_csync1/test.db.ctmp"; static void setup(void) { fail_if(system("rm -rf /tmp/check_csync1") < 0, "Setup failed"); + fail_if(system("rm -rf /tmp/check_csync2") < 0, "Setup failed"); fail_if(system("mkdir -p /tmp/check_csync1") < 0, "Setup failed"); + fail_if(system("mkdir -p /tmp/check_csync2") < 0, "Setup failed"); fail_if(csync_create(&csync, "/tmp/check_csync1", "/tmp/check_csync2") < 0, "Setup failed"); SAFE_FREE(csync->options.config_dir); csync->options.config_dir = c_strdup("/tmp/check_csync1/"); From b1c0cc7f58d90ba95e08842007905342f6b09295 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 20 May 2008 19:07:15 +0200 Subject: [PATCH 2/4] Fix variables in sqlite find module. --- cmake/Modules/FindSqlite3.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/Modules/FindSqlite3.cmake b/cmake/Modules/FindSqlite3.cmake index fb724b27d..6f3ffb43c 100644 --- a/cmake/Modules/FindSqlite3.cmake +++ b/cmake/Modules/FindSqlite3.cmake @@ -33,7 +33,7 @@ else (SQLITE3_LIBRARIES AND SQLITE3_INCLUDE_DIRS) NAMES sqlite3.h PATHS - ${_Sqlite3IncDir} + ${__SQLITE3_INCLUDEDIR} /usr/include /usr/local/include /opt/local/include @@ -44,7 +44,7 @@ else (SQLITE3_LIBRARIES AND SQLITE3_INCLUDE_DIRS) NAMES sqlite3 PATHS - ${_Sqlite3LinkDir} + ${_SQLITE3_LIBDIR} /usr/lib /usr/local/lib /opt/local/lib From 0a6cf13cafc92242d7428e22311c1e1fb822c0cd Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 20 May 2008 19:16:47 +0200 Subject: [PATCH 3/4] Fix typo. --- cmake/Modules/FindSqlite3.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/Modules/FindSqlite3.cmake b/cmake/Modules/FindSqlite3.cmake index 6f3ffb43c..aa650e38a 100644 --- a/cmake/Modules/FindSqlite3.cmake +++ b/cmake/Modules/FindSqlite3.cmake @@ -33,7 +33,7 @@ else (SQLITE3_LIBRARIES AND SQLITE3_INCLUDE_DIRS) NAMES sqlite3.h PATHS - ${__SQLITE3_INCLUDEDIR} + ${_SQLITE3_INCLUDEDIR} /usr/include /usr/local/include /opt/local/include From 3da8b3314365bff131ee392ef67c209ddaa1c56b Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 20 May 2008 21:55:57 +0200 Subject: [PATCH 4/4] Rename the sqlite3 module. --- cmake/Modules/{FindSqlite3.cmake => FindSQLite3.cmake} | 0 src/CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename cmake/Modules/{FindSqlite3.cmake => FindSQLite3.cmake} (100%) diff --git a/cmake/Modules/FindSqlite3.cmake b/cmake/Modules/FindSQLite3.cmake similarity index 100% rename from cmake/Modules/FindSqlite3.cmake rename to cmake/Modules/FindSQLite3.cmake diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index baef7ec08..bb79921eb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,7 +2,7 @@ project(libcsync) add_subdirectory(std) -find_package(Sqlite3 REQUIRED) +find_package(SQLite3 REQUIRED) find_package(Iniparser REQUIRED) find_package(Dlfcn REQUIRED) find_package(RT REQUIRED)