Skip to content

Commit e8a3174

Browse files
committed
** BREAKING** _INIT macros are now _DATA macros for consistency with other mulle libraries
update build system
1 parent 70a8287 commit e8a3174

33 files changed

+343
-128
lines changed

.github/workflows/mulle-sde-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: CI
33
on:
44
push:
55
branches:
6-
- release
6+
- master
77
pull_request:
88
workflow_dispatch:
99

@@ -31,7 +31,7 @@ jobs:
3131
- name: Dump Environment
3232
run: env | sort
3333

34-
- uses: actions/checkout@v3
34+
- uses: actions/checkout@v4
3535

3636
- uses: mulle-sde/github-ci@v1
3737

.mulle/share/env/tool-extension

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.mulle/share/env/tool-plugin

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.mulle/share/sde/version/mulle-c/c-cmake

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.mulle/share/sde/version/mulle-c/github-actions

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.mulle/share/sde/version/mulle-sde/cmake

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CMakeLists.txt

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
cmake_minimum_required( VERSION 3.14)
22

3-
project( mulle-thread C)
3+
project( mulle-thread VERSION 4.6.0 LANGUAGES C)
44

55

66

77

88
### mulle-sde environment
99

1010
# add cmake module paths to search path
11-
list( INSERT CMAKE_MODULE_PATH 0 "${PROJECT_SOURCE_DIR}/cmake/share")
12-
list( INSERT CMAKE_MODULE_PATH 0 "${PROJECT_SOURCE_DIR}/cmake/reflect")
13-
list( INSERT CMAKE_MODULE_PATH 0 "${PROJECT_SOURCE_DIR}/cmake")
11+
list( INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_SOURCE_DIR}/cmake/share")
12+
list( INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_SOURCE_DIR}/cmake/reflect")
13+
list( INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
1414

1515
include( Environment)
1616

@@ -52,4 +52,10 @@ if( LINK_PHASE)
5252
endif()
5353

5454
include( InstallLibrary)
55+
56+
if( LINK_PHASE)
57+
include( InstallCMakeInclude)
58+
include( InstallCMakePackage)
59+
endif()
60+
5561
include( FinalOutput OPTIONAL)

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,16 +108,14 @@ Add `-isystem src/mulle-concurrent` to your `CFLAGS` and compile all the sources
108108

109109
## Install
110110

111-
### Install with mulle-sde
112-
113111
Use [mulle-sde](//github.com/mulle-sde) to build and install mulle-thread and all dependencies:
114112

115113
``` sh
116114
mulle-sde install --prefix /usr/local \
117115
https://github.com/mulle-concurrent/mulle-thread/archive/latest.tar.gz
118116
```
119117

120-
### Manual Installation
118+
### Legacy Installation
121119

122120
Install the requirements:
123121

clib.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name" : "mulle-thread",
3-
"version" : "4.5.3",
3+
"version" : "4.6.0",
44
"description" : "🔠 Cross-platform thread/mutex/tss/atomic operations in C",
55
"keywords" : [],
66
"license" : "BSD-3-Clause",

0 commit comments

Comments
 (0)