Merge pull request #214 from markito3/modern_sqlitecpp

Modern sqlitecpp

Makefile_sqlitecpp

@@ -33,6 +33,13 @@ UNTAR_TEMP_DIR := untar_temp_dir_$(shell echo $$RANDOM)
 
 SQLITECPP_HOME = $(PWD)/$(SQLITECPP_DIR)
 
+include $(BUILD_SCRIPTS)/sqlite_version.mk
+ifeq ($(SQLITE_LT_3_19), true)
+    LEGACY_ON_OR_OFF = ON
+else
+    LEGACY_ON_OR_OFF = OFF
+endif
+
 all: $(SQLITECPP_HOME)/sqlitecpp_prereqs.xml
 
 $(TARFILE):
@@ -58,7 +65,11 @@ $(SQLITECPP_HOME)/.cmake_done: $(SOURCE_CODE_TARGET)
 	cd $(SQLITECPP_HOME)/build; $(CMAKE) \
 	   	 -DSQLITECPP_INTERNAL_SQLITE=OFF \
 	   	 -DSQLITE_USE_LEGACY_STRUCT=ON \
-		 -DCMAKE_INSTALL_PREFIX=$(SQLITECPP_HOME) ..
+		 -DCMAKE_INSTALL_PREFIX=$(SQLITECPP_HOME) \
+		 -DSQLite3_INCLUDE_DIR=$(SQLITE_HOME)/include \
+		 -DSQLite3_LIBRARY=$(SQLITE_HOME)/lib/libsqlite3.so \
+		 -DSQLITE_USE_LEGACY_STRUCT=$(LEGACY_ON_OR_OFF) \
+		 ..
 	date > $@
 
 $(SQLITECPP_HOME)/.make_done: $(SQLITECPP_HOME)/.cmake_done

sqlite_version.mk

@@ -0,0 +1,6 @@
+ifdef SQLITE_VERSION
+    SQLITE_MAJOR_VERSION := $(shell echo $(SQLITE_VERSION) | awk -F. '{print $$1}')
+    SQLITE_MINOR_VERSION := $(shell echo $(SQLITE_VERSION) | awk -F. '{print $$2}')
+    SQLITE_SUBMINOR_VERSION := $(shell echo $(SQLITE_VERSION) | awk -F. '{print $$3}')
+    SQLITE_LT_3_19 := $(shell if [[ $(SQLITE_MAJOR_VERSION) -lt 3 || $(SQLITE_MAJOR_VERSION) -eq 3 && $(SQLITE_MINOR_VERSION) -lt 19 ]]; then echo true; else echo false; fi)
+endif