Skip to content

Commit 03b7066

Browse files
committed
update mulle-sde project to new version
1 parent 7b02da7 commit 03b7066

File tree

7 files changed

+23
-11
lines changed

7 files changed

+23
-11
lines changed

.mulle/share/env/environment-plugin.sh

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/version

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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cmake_minimum_required( VERSION 3.14)
22

33
project( mulle-objc-developer NONE)
44

5-
set( PROJECT_VERSION 0.25.0)
5+
set( PROJECT_VERSION 0.26.0)
66

77

88
if( APPLE)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.22.0
1+
0.26.0

src/mulle-objc/objc-cmake/project/all/cmake/share/ExecutableObjC.cmake

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,29 @@ if( UNIX AND NOT (APPLE OR COSMOPOLITAN OR MUSL_STATIC_ONLY))
3535
endif()
3636
endif()
3737

38+
#
39+
# MEMO: if I don't "if" MULLE_ATINIT_LIBRARY, then the compiler test on
40+
# cmake on Apple will error out, because it doesn't link it for
41+
# testing the compiler.
42+
#
3843
if( APPLE AND MULLE_OBJC)
3944
if( LINK_PHASE)
40-
target_link_options( "${EXECUTABLE_LINK_TARGET}"
41-
PUBLIC
42-
"SHELL:LINKER:-exported_symbol,___register_mulle_objc_universe"
43-
)
45+
if( MULLE_OBJC_RUNTIME_LIBRARY)
46+
target_link_options( "${EXECUTABLE_LINK_TARGET}"
47+
PUBLIC
48+
"SHELL:LINKER:-exported_symbol,___register_mulle_objc_universe"
49+
)
50+
endif()
4451

45-
if( MULLE_TEST)
52+
if( MULLE_ATINIT_LIBRARY)
4653
target_link_options( "${EXECUTABLE_LINK_TARGET}"
4754
PUBLIC
4855
"SHELL:LINKER:-exported_symbol,__mulle_atinit"
56+
)
57+
endif()
58+
if( MULLE_ATEXIT_LIBRARY)
59+
target_link_options( "${EXECUTABLE_LINK_TARGET}"
60+
PUBLIC
4961
"SHELL:LINKER:-exported_symbol,_mulle_atexit"
5062
)
5163
endif()

src/mulle-objc/objc-cmake/version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.25.0
1+
0.26.0

src/mulle-objc/objc/version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.25.0
1+
0.26.0

0 commit comments

Comments
 (0)