Skip to content

externpro 26.01.5-26-g734f91b sync #6

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

Merged
smanders merged 5 commits into from
Aug 26, 2026
Merged

externpro 26.01.5-26-g734f91b sync #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e735a5f
cmake: use libiconv package instead of system Iconv find_package
smanders Aug 26, 2026
40ec47b
cmake: set USE_LIBICONV in CMakeLists.txt instead of presets
smanders Aug 26, 2026
7558d4d
externpro 26.01.5-26-g734f91b
github-actions[bot] Aug 26, 2026
e16151e
update .github/release-tag.json
github-actions[bot] Aug 26, 2026
721b0ce
cmake: fix whitespace (tabs to spaces) to match surrounding lines
smanders Aug 26, 2026
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
2 changes: 1 addition & 1 deletion .devcontainer
Open in desktop
Submodule .devcontainer updated 2 files
+2 −2 cmake/pros.cmake
+4 −1 cmake/xpfunmac.cmake
4 changes: 2 additions & 2 deletions .github/release-tag.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"message": "xpro version 1.3.0.4 tag",
"tag": "xpv1.3.0.4"
"message": "xpro version 1.3.0.5 tag",
"tag": "xpv1.3.0.5"
}
10 changes: 2 additions & 8 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ INCLUDE(EnableWarnings)
set(targetsFile ${PROJECT_NAME}-targets)
if(COMMAND xpExternPackage)
set(CMAKE_OPT_INSTALL FALSE)
set(USE_CMAKE_ICONV ON)
set(USE_LIBICONV ON)
if(NOT DEFINED CMAKE_INSTALL_CMAKEDIR)
set(CMAKE_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/cmake)
endif()
else()
set(CMAKE_OPT_INSTALL TRUE)
set(USE_CMAKE_ICONV OFF)
set(USE_LIBICONV OFF)
set(CMAKE_INSTALL_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
endif()

Expand Down Expand Up @@ -324,12 +324,6 @@ IF(BUILD_FUZZERS)
ENDIF()

if(COMMAND xpExternPackage)
string(JOIN "\n" EXT1
"if(APPLE)"
" find_package(Iconv REQUIRED)"
"endif()"
""
)
xpExternPackage(TARGETS_FILE ${targetsFile}
LIBRARIES git2 DEFAULT_TARGETS git2
BASE v${CMAKE_PROJECT_VERSION} XPDIFF "patch"
Expand Down
17 changes: 7 additions & 10 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,26 +282,23 @@ INCLUDE(SelectGSSAPI)

# Optional external dependency: iconv
IF (USE_ICONV)
if(USE_CMAKE_ICONV)
if(USE_LIBICONV)
list(REMOVE_ITEM CMAKE_MODULE_PATH "${libgit2_SOURCE_DIR}/cmake/")
find_package(Iconv)
# libiconv::libiconv avoids hard-coded build system paths in targetsFile
find_package(libiconv)
list(APPEND CMAKE_MODULE_PATH "${libgit2_SOURCE_DIR}/cmake/")
include(FindIconv) # populate the ICONV_* variables
# Iconv_INCLUDE_DIR (cmake) and ICONV_INCLUDE_DIR (libgit2)
# are assumed to be the same below... it was true on my system
if(libiconv_FOUND)
set(ICONV_FOUND ${libiconv_FOUND})
set(ICONV_LIBRARIES ${LIBICONV_LIBRARIES})
endif()
else()
FIND_PACKAGE(Iconv)
endif()
ENDIF()
IF (ICONV_FOUND)
SET(GIT_USE_ICONV 1)
LIST(APPEND LIBGIT2_SYSTEM_INCLUDES ${ICONV_INCLUDE_DIR})
if(USE_CMAKE_ICONV AND TARGET Iconv::Iconv)
# Iconv::Iconv avoids hard-coded build system paths in targetsFile
list(APPEND LIBGIT2_LIBS Iconv::Iconv)
else()
LIST(APPEND LIBGIT2_LIBS ${ICONV_LIBRARIES})
endif()
LIST(APPEND LIBGIT2_PC_LIBS ${ICONV_LIBRARIES})
ENDIF()
ADD_FEATURE_INFO(iconv GIT_USE_ICONV "iconv encoding conversion support")
Expand Down