Skip to content

Commit

Permalink
* fix fobjc-tao detection, invert option
Browse files Browse the repository at this point in the history
  • Loading branch information
mulle-nat committed Nov 20, 2024
1 parent 080fd7a commit 7bc1532
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 11 deletions.
28 changes: 28 additions & 0 deletions RELEASENOTES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,31 @@
## 0.27.0

feat: improve build system and environment handling

* Enhance CMake configuration and build
- Add `OBJC_TAO_DEBUG_ENABLED` option for debug builds
- Update library linking with `WHOLE_ARCHIVE` support
- Fix paths to use `CMAKE_CURRENT_SOURCE_DIR` consistently
- Add config template for package installation

* Update VSCode integration
- Use environment variables for include paths
- Update debug configuration paths
- Improve IntelliSense settings

* Environment and workflow improvements
- Update GitHub Actions to use checkout@v4
- Add `workflow_dispatch` support
- Fix environment plugin handling
- Update environment version to 5.3.0

* Other improvements
- Enable include.h and include-private.h conditionals
- Update trace environment variable name
- Fix project version handling
- Add mulle-clang-project dependency


### 0.26.1

* Various small improvements
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ if( NOT __COMPILER_DETECTION_AUX_C_CMAKE__)
#
# Detect if compiling with mulle-clang
#
if( MULLE_C_COMPILER_ID MATCHES "MulleClang" OR "$ENV{CC}" MATCHES ".*mulle-cl.*")
if( MULLE_C_COMPILER_ID MATCHES "MULLECLANG" OR "$ENV{CC}" MATCHES ".*mulle-cl.*")
message( STATUS "MulleClang compiler detected")
set( MULLE_OBJC ON)
else()
set( MULLE_OBJC OFF)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,18 @@ if( NOT __COMPILER_FLAGS_OBJC_CMAKE__)
#
# only useful in mulle-objc
#
option( OBJC_TAO_DEBUG_ENABLED "Enable Objective-C TAO for debug builds" MULLE_OBJC)
option( OBJC_TAO_DEBUG_DISABLED "Disable Objective-C TAO for debug builds" OFF)

set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OTHER_OBJC_FLAGS} ${UNWANTED_OBJC_WARNINGS}")
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OTHER_OBJC_FLAGS} ${UNWANTED_OBJC_WARNINGS}")

if( CMAKE_BUILD_TYPE)
string( TOUPPER "${CMAKE_BUILD_TYPE}" TMP_CONFIGURATION_NAME)
if( TMP_CONFIGURATION_NAME STREQUAL "DEBUG")
if( OBJC_TAO_DEBUG_ENABLED)
message( STATUS "Objective-C TAO enabled")
add_definitions( "-fobjc-tao")
endif()
else()
add_definitions( "-DNS_BLOCK_ASSERTIONS" )
string( TOUPPER "${CMAKE_BUILD_TYPE}" TMP_CONFIGURATION_NAME)
if( TMP_CONFIGURATION_NAME STREQUAL "DEBUG")
if( MULLE_OBJC AND NOT OBJC_TAO_DEBUG_DISABLED)
message( STATUS "Objective-C TAO enabled")
add_definitions( "-fobjc-tao")
endif()
else()
add_definitions( "-DNS_BLOCK_ASSERTIONS" )
endif()
endif()

0 comments on commit 7bc1532

Please sign in to comment.