Fixing cmake file

Author: Ivan Stoev

pCloudCC/CMakeLists.txt

@@ -6,25 +6,36 @@ include_directories(${Boost_INCLUDE_DIR})
 link_directories(${Boost_LIBRARY_DIR})
 
 #set (CMAKE_CXX_FLAGS "-fsanitize=address")
+set (PCLSYNC_PATH ${CMAKE_SOURCE_DIR}/lib/pclsync)
+set (MBEDTLS_PATH ${CMAKE_SOURCE_DIR}/lib/mbedtls)
+set (SQLITE3_PATH ${CMAKE_SOURCE_DIR}/lib/sqlite)
+
+add_subdirectory(${MBEDTLS_PATH})
+
+include_directories(${SQLITE3_PATH})
+add_custom_target(
+  sqlite3_lib
+  COMMAND ./configure && make
+  WORKING_DIRECTORY ${SQLITE3_PATH}
+)
 
-set (PCLSYNC_PATH ../pclsync)
 include_directories(${PCLSYNC_PATH})
 # add_custom_target(
-#    pclsync_clean
-#    COMMAND make clean
-#    WORKING_DIRECTORY ${PCLSYNC_PATH}
+#   pclsync_clean
+#   COMMAND make clean
+#   WORKING_DIRECTORY ${PCLSYNC_PATH}
 # )
 
-# add_custom_target(
-#    pclsync
-#    COMMAND make fs
-#    WORKING_DIRECTORY ${PCLSYNC_PATH}
-# )
+add_custom_target(
+  pclsync
+  COMMAND make fs
+  WORKING_DIRECTORY ${PCLSYNC_PATH}
+)
 
-set (OVERLAY_CLENT_PATH ${PCLSYNC_PATH}/lib/poverlay_linux)
+set (OVERLAY_CLENT_PATH ${CMAKE_SOURCE_DIR}/lib/poverlay_linux)
 include_directories(${OVERLAY_CLENT_PATH})
 
-link_directories(${PCLSYNC_PATH} ${PCLSYNC_PATH}/lib/mbedtls/library ${PCLSYNC_PATH}/lib/sqlite/inst/lib ${OVERLAY_CLENT_PATH})
+link_directories(${PCLSYNC_PATH} ${MBEDTLS_PATH}/library ${SQLITE3_PATH} ${OVERLAY_CLENT_PATH})
 
 
 add_executable(pcl_client main.cpp pclsync_lib.cpp control_tools.cpp ${OVERLAY_CLENT_PATH}/overlay_client.c ${OVERLAY_CLENT_PATH}/debug.c)
@@ -35,6 +46,6 @@ target_link_libraries(pcl_client psynclib mbedtls sqlite3 fuse pthread z
 
 target_link_libraries(pcl_client ${Boost_LIBRARIES})
 
-add_dependencies(pcl_client pclsync_clean pclsync)
+add_dependencies(pcl_client pclsync_clean pclsync sqlite3_lib)
 
 install(TARGETS pcl_client RUNTIME DESTINATION bin)

pCloudCC/lib/sqlite/Makefile

@@ -240,13 +240,13 @@ distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
-ACLOCAL = ${SHELL} /home/tuba/consoleclient/opensource/pclsync/lib/sqlite/missing aclocal-1.15
+ACLOCAL = ${SHELL} /home/tuba/consoleclient/opensource/pCloudCC/lib/sqlite/missing aclocal-1.15
 AMTAR = $${TAR-tar}
 AM_DEFAULT_VERBOSITY = 1
 AR = ar
-AUTOCONF = ${SHELL} /home/tuba/consoleclient/opensource/pclsync/lib/sqlite/missing autoconf
-AUTOHEADER = ${SHELL} /home/tuba/consoleclient/opensource/pclsync/lib/sqlite/missing autoheader
-AUTOMAKE = ${SHELL} /home/tuba/consoleclient/opensource/pclsync/lib/sqlite/missing automake-1.15
+AUTOCONF = ${SHELL} /home/tuba/consoleclient/opensource/pCloudCC/lib/sqlite/missing autoconf
+AUTOHEADER = ${SHELL} /home/tuba/consoleclient/opensource/pCloudCC/lib/sqlite/missing autoheader
+AUTOMAKE = ${SHELL} /home/tuba/consoleclient/opensource/pCloudCC/lib/sqlite/missing automake-1.15
 AWK = mawk
 BUILD_CFLAGS = 
 CC = gcc
@@ -285,7 +285,7 @@ LIPO =
 LN_S = ln -s
 LTLIBOBJS = 
 LT_SYS_LIBRARY_PATH = 
-MAKEINFO = ${SHELL} /home/tuba/consoleclient/opensource/pclsync/lib/sqlite/missing makeinfo
+MAKEINFO = ${SHELL} /home/tuba/consoleclient/opensource/pCloudCC/lib/sqlite/missing makeinfo
 MANIFEST_TOOL = :
 MKDIR_P = /bin/mkdir -p
 NM = /usr/bin/nm -B
@@ -310,10 +310,10 @@ SHELL = /bin/bash
 STRIP = strip
 THREADSAFE_FLAGS = -D_REENTRANT=1 -DSQLITE_THREADSAFE=1
 VERSION = 3.12.0
-abs_builddir = /home/tuba/consoleclient/opensource/pclsync/lib/sqlite
-abs_srcdir = /home/tuba/consoleclient/opensource/pclsync/lib/sqlite
-abs_top_builddir = /home/tuba/consoleclient/opensource/pclsync/lib/sqlite
-abs_top_srcdir = /home/tuba/consoleclient/opensource/pclsync/lib/sqlite
+abs_builddir = /home/tuba/consoleclient/opensource/pCloudCC/lib/sqlite
+abs_srcdir = /home/tuba/consoleclient/opensource/pCloudCC/lib/sqlite
+abs_top_builddir = /home/tuba/consoleclient/opensource/pCloudCC/lib/sqlite
+abs_top_srcdir = /home/tuba/consoleclient/opensource/pCloudCC/lib/sqlite
 ac_ct_AR = ar
 ac_ct_CC = gcc
 ac_ct_DUMPBIN = 
@@ -342,7 +342,7 @@ host_vendor = unknown
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = ${SHELL} /home/tuba/consoleclient/opensource/pclsync/lib/sqlite/install-sh
+install_sh = ${SHELL} /home/tuba/consoleclient/opensource/pCloudCC/lib/sqlite/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale