Add inih submodule, build with project, update CMake to reflect changes

This commit is contained in:
Kouya Heika committed 2026-04-23 04:54:12 -05:00
1 parent efbff0b665
commit c24c18d769
3 files changed
+5 -11

No files matched your search

+3
View File
@@ -1,3 +1,6 @@
[submodule "deps/vector"]
path = deps/vector
url = https://github.com/goldsborough/vector.git
[submodule "deps/inih"]
path = deps/inih
url = https://github.com/benhoyt/inih.git
+1 -11
View File
@@ -18,32 +18,24 @@ find_package(PkgConfig QUIET)
add_executable(${PROJECT_NAME}
src/main.c
deps/inih/ini.c
deps/vector/vector.c
)
if(PkgConfig_FOUND)
pkg_check_modules(INIH REQUIRED inih)
pkg_check_modules(MICROHTTPD REQUIRED libmicrohttpd)
pkg_check_modules(MXML REQUIRED mxml)
target_include_directories(${PROJECT_NAME} PRIVATE
${INIH_INCLUDE_DIRS}
${MICROHTTPD_INCLUDE_DIRS}
${MXML_INCLUDE_DIRS}
)
target_link_libraries(${PROJECT_NAME} PRIVATE
${INIH_LIBRARIES}
${MICROHTTPD_LIBRARIES}
${MXML_LIBRARIES}
)
else()
find_path(INIH_INCLUDE_DIR ini.h)
find_library(INIH_LIBRARY NAMES inih libinih)
if(NOT INIH_INCLUDE_DIR OR NOT INIH_LIBRARY)
message(FATAL_ERROR "inih not found")
endif()
find_path(MICROHTTPD_INCLUDE_DIR microhttpd.h)
find_library(MICROHTTPD_LIBRARY NAMES microhttpd libmicrohttpd)
if(NOT MICROHTTPD_INCLUDE_DIR OR NOT MICROHTTPD_LIBRARY)
@@ -57,13 +49,11 @@ else()
endif()
target_include_directories(${PROJECT_NAME} PRIVATE
${INIH_INCLUDE_DIR}
${MICROHTTPD_INCLUDE_DIR}
${MXML_INCLUDE_DIR}
)
target_link_libraries(${PROJECT_NAME} PRIVATE
${INIH_LIBRARY}
${MICROHTTPD_LIBRARY}
${MXML_LIBRARY}
)
Vendored Submodule
+1
Submodule deps/inih added at 577ae2dee1.