try to fix travis

Author: aminroosta

.travis.yml

@@ -6,14 +6,16 @@ addons:
   apt:
     sources:
       - ubuntu-toolchain-r-test
+      - george-edison55-precise-backports
     packages:
       - gcc-5
       - g++-5
       - libsqlite3-dev
       - libsqlcipher-dev
-      - libboost-all-dev
+      - cmake-data
+      - cmake
 
 before_install:
   - export CXX="g++-5" CC="gcc-5"
 
-script: ./configure && make test && make clean && make LDFLAGS="-lsqlcipher -DENABLE_SQLCIPHER_TESTS" test
+script: mkdir build && cd ./build && cmake -DENABLE_SQLCIPHER_TESTS=ON .. && make && ./tests

CMakeLists.txt

@@ -1,4 +1,5 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.0)
+OPTION(ENABLE_SQLCIPHER_TESTS "enable sqlchipher test")
 
 # Creates the file compile_commands.json in the build directory.
 SET( CMAKE_EXPORT_COMPILE_COMMANDS ON )
@@ -11,6 +12,7 @@ include("cmake/DownloadProject.CMake")
 project(SqliteModernCpp)
 
 find_package(sqlite3 REQUIRED)
+
 download_project(
     PROJ                catch
     GIT_REPOSITORY      [email protected]:catchorg/Catch2.git
@@ -22,6 +24,13 @@ set(CATCH_INCLUDE_DIR           ${CMAKE_BINARY_DIR}/catch-src/single_include/)
 set(TEST_SOURCE_DIR             ${CMAKE_SOURCE_DIR}/tests)
 file(GLOB TEST_SOURCES          ${TEST_SOURCE_DIR}/*.cc)
 
+message(STATUS ${ENABLE_SQLCIPHER_TESTS})
+IF(NOT ENABLE_SQLCIPHER_TESTS)
+    list(REMOVE_ITEM TEST_SOURCES ${TEST_SOURCE_DIR}/sqlcipher.cc)
+ENDIF(NOT ENABLE_SQLCIPHER_TESTS)
+message(STATUS ${TEST_SOURCES})
+message(STATUS ${TEST_SOURCE_DIR}/sqlcipher.cc)
+
 enable_testing()
 
 add_library (sqlite_modern_cpp INTERFACE)
@@ -33,6 +42,9 @@ target_include_directories(Catch INTERFACE ${CATCH_INCLUDE_DIR})
 add_executable(tests ${TEST_SOURCES})
 target_include_directories(tests INTERFACE ${SQLITE3_INCLUDE_DIRS})
 target_link_libraries(tests Catch sqlite_modern_cpp sqlite3)
+IF(ENABLE_SQLCIPHER_TESTS)
+    set_target_properties(tests PROPERTIES COMPILE_FLAGS '-lsqlcipher')
+ENDIF(ENABLE_SQLCIPHER_TESTS)
 
 ParseAndAddCatchTests(tests)
 

tests/sqlcipher.cc

@@ -3,56 +3,54 @@
 #include <cstdlib>
 #include <catch.hpp>
 
-#ifdef ENABLE_SQLCIPHER_TESTS
-    #include <sqlite_modern_cpp/sqlcipher.h>
-    using namespace sqlite;
-    using namespace std;
+#include <sqlite_modern_cpp/sqlcipher.h>
+using namespace sqlite;
+using namespace std;
 
-    struct TmpFile
+struct TmpFile
+{
+    string fname;
+
+    TmpFile(): fname("./sqlcipher.db") { }
+    ~TmpFile() { remove(fname.c_str()); }
+};
+
+TEST_CASE("sqlcipher works", "[sqlcipher]") {
+    TmpFile file;
+    sqlcipher_config config;
+    {
+        config.key = "DebugKey";
+        sqlcipher_database db(file.fname, config);
+
+        db << "CREATE TABLE foo (a integer, b string);";
+        db << "INSERT INTO foo VALUES (?, ?)" << 1 << "hello";
+        db << "INSERT INTO foo VALUES (?, ?)" << 2 << "world";
+
+        string str;
+        db << "SELECT b from FOO where a=?;" << 2 >> str;
+
+        REQUIRE(str == "world");
+    }
+
+    bool failed = false;
+    try {
+        config.key = "DebugKey2";
+        sqlcipher_database db(file.fname, config);
+        db << "INSERT INTO foo VALUES (?, ?)" << 3 << "fail";
+    } catch(errors::notadb) {
+        failed = true;
+        // Expected, wrong key
+    }
+    REQUIRE(failed == true);
+
+    {
+        config.key = "DebugKey";
+        sqlcipher_database db(file.fname, config);
+        db.rekey("DebugKey2");
+    }
     {
-        string fname;
-
-        TmpFile(): fname("./sqlcipher.db") { }
-        ~TmpFile() { remove(fname.c_str()); }
-    };
-
-    TEST_CASE("sqlcipher works", "[sqlcipher]") {
-        TmpFile file;
-        sqlcipher_config config;
-        {
-            config.key = "DebugKey";
-            sqlcipher_database db(file.fname, config);
-
-            db << "CREATE TABLE foo (a integer, b string);";
-            db << "INSERT INTO foo VALUES (?, ?)" << 1 << "hello";
-            db << "INSERT INTO foo VALUES (?, ?)" << 2 << "world";
-
-            string str;
-            db << "SELECT b from FOO where a=?;" << 2 >> str;
-
-            REQUIRE(str == "world");
-        }
-
-        bool failed = false;
-        try {
-            config.key = "DebugKey2";
-            sqlcipher_database db(file.fname, config);
-            db << "INSERT INTO foo VALUES (?, ?)" << 3 << "fail";
-        } catch(errors::notadb) {
-            failed = true;
-            // Expected, wrong key
-        }
-        REQUIRE(failed == true);
-
-        {
-            config.key = "DebugKey";
-            sqlcipher_database db(file.fname, config);
-            db.rekey("DebugKey2");
-        }
-        {
-            config.key = "DebugKey2";
-            sqlcipher_database db(file.fname, config);
-            db << "INSERT INTO foo VALUES (?, ?)" << 3 << "fail";
-        }
+        config.key = "DebugKey2";
+        sqlcipher_database db(file.fname, config);
+        db << "INSERT INTO foo VALUES (?, ?)" << 3 << "fail";
     }
-#endif
+}