Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libini added as a submodule and compiled/linked directly into libiio. #405

Closed
wants to merge 1 commit into from
+8 −8
Closed

libini added as a submodule and compiled/linked directly into libiio. #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "deps/wingetopt"]
path = deps/wingetopt
url = https://github.com/alex85k/wingetopt.git
[submodule "deps/libini"]
path = deps/libini
url = https://github.com/pcercuei/libini.git
12 changes: 4 additions & 8 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,14 +164,10 @@ if(WITH_LOCAL_BACKEND)

option(WITH_LOCAL_CONFIG "Read local context attributes from /etc/libiio.ini" OFF)
if (WITH_LOCAL_CONFIG)
find_library(LIBINI_LIBRARIES ini)
find_path(LIBINI_INCLUDE_DIR ini.h)
if (NOT LIBINI_LIBRARIES OR NOT LIBINI_INCLUDE_DIR)
message(SEND_ERROR "WITH_LOCAL_CONFIG option requires libini to be installed")
else()
include_directories(${LIBINI_INCLUDE_DIR})
list(APPEND LIBS_TO_LINK ${LIBINI_LIBRARIES})
endif()
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/deps/libini)
set(LIBINI_C_FILE ${CMAKE_CURRENT_SOURCE_DIR}/deps/libini/libini.c)

list(APPEND LIBIIO_CFILES ${LIBINI_C_FILE})
endif()
endif()

Expand Down
1 change: 1 addition & 0 deletions deps/libini
Open in desktop
Submodule libini added at c3413d