Skip to content

Commit 6237b55

Browse files
authored
Merge pull request #5 from externpro/manifestUpdate
manifest update
2 parents c80d62a + a880a34 commit 6237b55

5 files changed

Lines changed: 33 additions & 33 deletions

File tree

.devcontainer

Submodule .devcontainer updated 69 files

.github/workflows/xpbuild.yml

Lines changed: 10 additions & 16 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,15 @@ on:
710
workflow_dispatch:
811
jobs:
912
linux:
10-
uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.1
11-
with:
12-
cmake-workflow-preset: Linux
13-
runon: ubuntu-latest
14-
secrets: inherit
15-
linux-arm64:
16-
uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.1
17-
with:
18-
cmake-workflow-preset: Linux
19-
runon: ubuntu-24.04-arm
13+
permissions:
14+
contents: read
15+
pull-requests: write
16+
packages: write
17+
uses: externpro/externpro/.github/workflows/build-linux.yml@25.07.3
2018
secrets: inherit
2119
macos:
22-
uses: externpro/externpro/.github/workflows/build-macos.yml@25.05.1
23-
with:
24-
cmake-workflow-preset: Darwin
20+
uses: externpro/externpro/.github/workflows/build-macos.yml@25.07.3
2521
secrets: inherit
2622
windows:
27-
uses: externpro/externpro/.github/workflows/build-windows.yml@25.05.1
28-
with:
29-
cmake-workflow-preset: Windows
23+
uses: externpro/externpro/.github/workflows/build-windows.yml@25.07.3
3024
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.05.1
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: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,21 @@ include(GNUInstallDirs)
99

1010
#------------------------------------------------------------------------------
1111
# externpro
12-
include(xpflags)
1312
set(targetsFile ${PROJECT_NAME}Config)
14-
if(NOT DEFINED XP_NAMESPACE)
15-
set(XP_NAMESPACE SQLite)
16-
set(debugPostfix DEBUG_POSTFIX d)
17-
set(XP_INSTALL_CMAKEDIR cmake)
13+
if(DEFINED XP_NAMESPACE)
14+
xpExternPackage(NAMESPACE ${XP_NAMESPACE} ALIAS_NAMESPACE SQLite
15+
TARGETS_FILE ${targetsFile} LIBRARIES ${PROJECT_NAME}
16+
BASE ${CMAKE_PROJECT_VERSION} XPDIFF "patch" FIND_THREADS
17+
WEB "https://www.sqlite.org/index.html 'SQLite website'" UPSTREAM "github.com/azadkuh/sqlite-amalgamation"
18+
DESC "C-language library that implements a small, fast, self-contained, high-reliability, full-featured, SQL database engine"
19+
LICENSE "[public domain](https://www.sqlite.org/copyright.html 'open-source, not open-contribution')"
20+
)
21+
set(CMAKE_NAMESPACE ${XP_NAMESPACE})
22+
set(CMAKE_INSTALL_CMAKEDIR ${XP_INSTALL_CMAKEDIR})
1823
else()
19-
set(XP_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/cmake)
20-
string(JOIN "\n" EXT1
21-
"set(THREAD_PREFER_PTHREAD_FLAG ON)"
22-
"find_package(Threads REQUIRED) # depends on Threads::Threads"
23-
""
24-
)
25-
xpPackageDevel(TARGETS_FILE ${targetsFile} LIBRARIES ${XP_NAMESPACE}::${PROJECT_NAME})
24+
set(debugPostfix DEBUG_POSTFIX d)
25+
set(CMAKE_NAMESPACE SQLite)
26+
set(CMAKE_INSTALL_CMAKEDIR cmake)
2627
endif()
2728

2829
#------------------------------------------------------------------------------
@@ -124,8 +125,8 @@ install(TARGETS ${PROJECT_NAME} EXPORT ${targetsFile}
124125
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
125126
)
126127
install(EXPORT ${targetsFile}
127-
NAMESPACE ${XP_NAMESPACE}::
128-
DESTINATION ${XP_INSTALL_CMAKEDIR}
128+
NAMESPACE ${CMAKE_NAMESPACE}::
129+
DESTINATION ${CMAKE_INSTALL_CMAKEDIR}
129130
)
130131
install(FILES
131132
${CMAKE_BINARY_DIR}/sqlite3_config.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}

CMakePresetsBase.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,11 @@
1010
"BUILD_SHELL": "ON"
1111
}
1212
}
13+
],
14+
"buildPresets": [
15+
{
16+
"name": "build-base",
17+
"hidden": true
18+
}
1319
]
1420
}

0 commit comments

Comments
 (0)