Skip to content

Commit 87047c6

Browse files
authored
Merge pull request #2 from externpro/manifestUpdate
manifest update
2 parents 0bf6d3b + 2c2d3e2 commit 87047c6

4 files changed

Lines changed: 24 additions & 23 deletions

File tree

.devcontainer

Submodule .devcontainer updated 58 files

.github/workflows/xpbuild.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
name: Build
2+
permissions:
3+
contents: read
4+
pull-requests: write
25
on:
36
push:
47
branches: [ "dev" ]
@@ -7,24 +10,21 @@ on:
710
workflow_dispatch:
811
jobs:
912
linux:
10-
uses: externpro/externpro/.github/workflows/build-linux.yml@25.06
13+
permissions:
14+
contents: read
15+
pull-requests: write
16+
packages: write
17+
uses: externpro/externpro/.github/workflows/build-linux.yml@25.07.3
1118
with:
1219
cmake-workflow-preset: LinuxRelease
13-
runon: ubuntu-latest
14-
secrets: inherit
15-
linux-arm64:
16-
uses: externpro/externpro/.github/workflows/build-linux.yml@25.06
17-
with:
18-
cmake-workflow-preset: LinuxRelease
19-
runon: ubuntu-24.04-arm
2020
secrets: inherit
2121
macos:
22-
uses: externpro/externpro/.github/workflows/build-macos.yml@25.06
22+
uses: externpro/externpro/.github/workflows/build-macos.yml@25.07.3
2323
with:
2424
cmake-workflow-preset: DarwinRelease
2525
secrets: inherit
2626
windows:
27-
uses: externpro/externpro/.github/workflows/build-windows.yml@25.06
27+
uses: externpro/externpro/.github/workflows/build-windows.yml@25.07.3
2828
with:
2929
cmake-workflow-preset: WindowsRelease
3030
secrets: inherit

.github/workflows/xprelease.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@ on:
99
jobs:
1010
# Upload build artifacts as release assets
1111
release-from-build:
12-
uses: externpro/externpro/.github/workflows/release-from-build.yml@25.06
12+
uses: externpro/externpro/.github/workflows/release-from-build.yml@25.07.3
1313
with:
1414
workflow_run_url: ${{ github.event.inputs.workflow_run_url }}
15-
artifact_pattern: "*.tar.xz"
1615
permissions:
1716
contents: write
1817
id-token: write

CMakeLists.txt

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
cmake_minimum_required(VERSION 3.31)
22
set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES .devcontainer/cmake/xproinc.cmake)
33
project(rapidxml)
4-
include(GNUInstallDirs)
5-
include(xpflags)
64
set(lib_name ${PROJECT_NAME})
75
########################################
86
set(root_srcs
@@ -19,16 +17,20 @@ list(APPEND ${lib_name}_libsrcs ${root_srcs})
1917
add_library(${lib_name} INTERFACE ${${lib_name}_libsrcs})
2018
target_include_directories(${lib_name} INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
2119
########################################
22-
set(lib ${lib_name})
20+
set(targetsFile ${PROJECT_NAME}-targets)
2321
if(DEFINED XP_NAMESPACE)
22+
xpExternPackage(NAMESPACE ${XP_NAMESPACE}
23+
TARGETS_FILE ${targetsFile} LIBRARIES ${lib_name}
24+
BASE v1.13 XPDIFF "intro"
25+
WEB "http://rapidxml.sourceforge.net/"
26+
DESC "fast XML parser"
27+
LICENSE "[BSL-1.0 or MIT](http://rapidxml.sourceforge.net/license.txt 'Boost Software License or MIT License')"
28+
)
2429
set(nameSpace NAMESPACE ${XP_NAMESPACE}::)
25-
string(PREPEND lib "${XP_NAMESPACE}::")
26-
endif()
27-
if(NOT DEFINED XP_INSTALL_CMAKEDIR)
28-
set(XP_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/cmake)
30+
set(CMAKE_INSTALL_CMAKEDIR ${XP_INSTALL_CMAKEDIR})
31+
elseif(NOT DEFINED CMAKE_INSTALL_CMAKEDIR)
32+
set(CMAKE_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/cmake)
2933
endif()
30-
set(targetsFile ${PROJECT_NAME}-targets)
31-
xpPackageDevel(TARGETS_FILE ${targetsFile} LIBRARIES ${lib})
3234
install(TARGETS ${lib_name} EXPORT ${targetsFile})
3335
install(FILES ${root_srcs} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
34-
install(EXPORT ${targetsFile} DESTINATION ${XP_INSTALL_CMAKEDIR} ${nameSpace})
36+
install(EXPORT ${targetsFile} DESTINATION ${CMAKE_INSTALL_CMAKEDIR} ${nameSpace})

0 commit comments

Comments
 (0)