Skip to content

updated dependencies from devel packages #3

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 3 commits into from
Nov 12, 2025
Merged

updated dependencies from devel packages #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3465ed
externpro 25.06-12-g0b86180
smanders Nov 12, 2025
3b455f9
externpro github/workflows @25.06
smanders Nov 12, 2025
e320027
cmake: expat renamed libexpat to match repo
smanders Nov 12, 2025
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 23 files
+4 −4 .github/wf-templates/xpbuild.yml
+1 −1 .github/wf-templates/xprelease.yml
+9 −9 .github/workflows/README.md
+14 −4 .github/workflows/build-linux.yml
+14 −4 .github/workflows/build-macos.yml
+14 −4 .github/workflows/build-windows.yml
+5 −5 .github/workflows/release-from-build.yml
+0 −78 cmake/Findwebpro.cmake
+77 −66 cmake/README.md
+0 −17 cmake/cmswxconfig.cmake
+18 −1 cmake/deps.cmake
+3 −4 cmake/deps.dot
+ − cmake/deps.png
+341 −282 cmake/pros.cmake
+14 −36 cmake/pros.md
+1 −1 cmake/sync.cmake
+2 −11 cmake/xpfunmac.cmake
+2 −2 cmake/xptoplevel.cmake
+82 −139 cmake/xpweb.cmake
+0 −1 compose.bld.yml
+0 −1 compose.gpu.yml
+0 −17 denv.sh
+0 −5 local.dockerfile
8 changes: 4 additions & 4 deletions .github/workflows/xpbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,24 @@ on:
workflow_dispatch:
jobs:
linux:
uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.2
uses: externpro/externpro/.github/workflows/build-linux.yml@25.06
with:
cmake-workflow-preset: Linux
runon: ubuntu-latest
secrets: inherit
linux-arm64:
uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.2
uses: externpro/externpro/.github/workflows/build-linux.yml@25.06
with:
cmake-workflow-preset: Linux
runon: ubuntu-24.04-arm
secrets: inherit
macos:
uses: externpro/externpro/.github/workflows/build-macos.yml@25.05.2
uses: externpro/externpro/.github/workflows/build-macos.yml@25.06
with:
cmake-workflow-preset: Darwin
secrets: inherit
windows:
uses: externpro/externpro/.github/workflows/build-windows.yml@25.05.2
uses: externpro/externpro/.github/workflows/build-windows.yml@25.06
with:
cmake-workflow-preset: Windows
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/xprelease.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
# Upload build artifacts as release assets
release-from-build:
uses: externpro/externpro/.github/workflows/release-from-build.yml@25.05.2
uses: externpro/externpro/.github/workflows/release-from-build.yml@25.06
with:
workflow_run_url: ${{ github.event.inputs.workflow_run_url }}
artifact_pattern: "*.tar.xz"
Expand Down
8 changes: 4 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if(NOT DEFINED XP_INSTALL_CMAKEDIR)
set(XP_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/cmake)
endif()
set(targetsFile ${PROJECT_NAME}-targets)
xpPackageDevel(TARGETS_FILE ${targetsFile} DEPS expat openssl LIBRARIES ${lib})
xpPackageDevel(TARGETS_FILE ${targetsFile} DEPS libexpat openssl LIBRARIES ${lib})
enable_testing()
set_property(GLOBAL PROPERTY USE_FOLDERS ON) # enables MSVC Solution Folders
########################################
Expand All @@ -25,9 +25,9 @@ if(MSVC)
endif()
########################################
find_package(OpenSSL)
find_package(EXPAT)
if(NOT EXPAT_FOUND)
message(FATAL_ERROR "can't find expat - libstrophe cmake currently hard-coded to use expat")
find_package(libexpat)
if(NOT LIBEXPAT_FOUND)
message(FATAL_ERROR "can't find libexpat - libstrophe cmake currently hard-coded to use libexpat")
endif()
if(NOT OPENSSL_FOUND)
message(FATAL_ERROR "can't find OpenSSL - libstrophe cmake currently hard-coded to use OpenSSL")
Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ add_library(${lib_name} STATIC ${${lib_name}_libsrcs})
target_include_directories(${lib_name} PUBLIC $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
)
target_link_libraries(${lib_name} PRIVATE ${EXPAT_LIBRARIES} ${OPENSSL_LIBRARIES} ${SYS_LIBS})
target_link_libraries(${lib_name} PRIVATE ${LIBEXPAT_LIBRARIES} ${OPENSSL_LIBRARIES} ${SYS_LIBS})
set_target_properties(${lib_name} PROPERTIES
PREFIX "" # strip off the "lib" prefix, since it's already libstrophe
)
Expand Down