Skip to content

Commit 7bc1532

Browse files
committed
* fix fobjc-tao detection, invert option
1 parent 080fd7a commit 7bc1532

File tree

3 files changed

+38
-11
lines changed

3 files changed

+38
-11
lines changed

RELEASENOTES.md

+28
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,31 @@
1+
## 0.27.0
2+
3+
feat: improve build system and environment handling
4+
5+
* Enhance CMake configuration and build
6+
- Add `OBJC_TAO_DEBUG_ENABLED` option for debug builds
7+
- Update library linking with `WHOLE_ARCHIVE` support
8+
- Fix paths to use `CMAKE_CURRENT_SOURCE_DIR` consistently
9+
- Add config template for package installation
10+
11+
* Update VSCode integration
12+
- Use environment variables for include paths
13+
- Update debug configuration paths
14+
- Improve IntelliSense settings
15+
16+
* Environment and workflow improvements
17+
- Update GitHub Actions to use checkout@v4
18+
- Add `workflow_dispatch` support
19+
- Fix environment plugin handling
20+
- Update environment version to 5.3.0
21+
22+
* Other improvements
23+
- Enable include.h and include-private.h conditionals
24+
- Update trace environment variable name
25+
- Fix project version handling
26+
- Add mulle-clang-project dependency
27+
28+
129
### 0.26.1
230

331
* Various small improvements

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ if( NOT __COMPILER_DETECTION_AUX_C_CMAKE__)
1212
#
1313
# Detect if compiling with mulle-clang
1414
#
15-
if( MULLE_C_COMPILER_ID MATCHES "MulleClang" OR "$ENV{CC}" MATCHES ".*mulle-cl.*")
15+
if( MULLE_C_COMPILER_ID MATCHES "MULLECLANG" OR "$ENV{CC}" MATCHES ".*mulle-cl.*")
16+
message( STATUS "MulleClang compiler detected")
1617
set( MULLE_OBJC ON)
1718
else()
1819
set( MULLE_OBJC OFF)

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

+8-10
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,18 @@ if( NOT __COMPILER_FLAGS_OBJC_CMAKE__)
1212
#
1313
# only useful in mulle-objc
1414
#
15-
option( OBJC_TAO_DEBUG_ENABLED "Enable Objective-C TAO for debug builds" MULLE_OBJC)
15+
option( OBJC_TAO_DEBUG_DISABLED "Disable Objective-C TAO for debug builds" OFF)
1616

1717
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OTHER_OBJC_FLAGS} ${UNWANTED_OBJC_WARNINGS}")
1818
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OTHER_OBJC_FLAGS} ${UNWANTED_OBJC_WARNINGS}")
1919

20-
if( CMAKE_BUILD_TYPE)
21-
string( TOUPPER "${CMAKE_BUILD_TYPE}" TMP_CONFIGURATION_NAME)
22-
if( TMP_CONFIGURATION_NAME STREQUAL "DEBUG")
23-
if( OBJC_TAO_DEBUG_ENABLED)
24-
message( STATUS "Objective-C TAO enabled")
25-
add_definitions( "-fobjc-tao")
26-
endif()
27-
else()
28-
add_definitions( "-DNS_BLOCK_ASSERTIONS" )
20+
string( TOUPPER "${CMAKE_BUILD_TYPE}" TMP_CONFIGURATION_NAME)
21+
if( TMP_CONFIGURATION_NAME STREQUAL "DEBUG")
22+
if( MULLE_OBJC AND NOT OBJC_TAO_DEBUG_DISABLED)
23+
message( STATUS "Objective-C TAO enabled")
24+
add_definitions( "-fobjc-tao")
2925
endif()
26+
else()
27+
add_definitions( "-DNS_BLOCK_ASSERTIONS" )
3028
endif()
3129
endif()

0 commit comments

Comments
 (0)