CMake: Use libini from deps/ folder

Use the version of libini properly cloned with "git subrepo" into the deps/ folder, instead of having a local copy. Signed-off-by: Paul Cercueil <[email protected]>
analogdevicesinc · Mar 21, 2022 · 20948cc · 20948cc
1 parent 219714a
commit 20948cc
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 850 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -253,7 +253,7 @@ if(WITH_LOCAL_BACKEND)
 
 	option(WITH_LOCAL_CONFIG "Read local context attributes from /etc/libiio.ini" ON)
 	if (WITH_LOCAL_CONFIG)
-		list(APPEND LIBIIO_CFILES ./libini/libini.c)
+		list(APPEND LIBIIO_CFILES ./deps/libini/libini.c)
 	endif()
 
 	option(WITH_LOCAL_MMAP_API "Use the mmap API provided in Analog Devices' kernel (not upstream)" ON)

diff --git a/libini/LICENSE.txt b/libini/LICENSE.txt
diff --git a/libini/README b/libini/README
diff --git a/libini/ini.h b/libini/ini.h
diff --git a/libini/libini.c b/libini/libini.c
diff --git a/local.c b/local.c
@@ -9,7 +9,7 @@
 #include "debug.h"
 #include "iio-private.h"
 #include "sort.h"
-#include "libini/ini.h"
+#include "deps/libini/ini.h"
 
 
 #include <dirent.h>