Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions cmake/CMakePlatforms.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,15 @@ elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
set(PLATFORM_OSX 1)
set(PLATFORM_NAME "OS X")
endif()

# Get the Xcode version being used.
execute_process(COMMAND xcodebuild -version
OUTPUT_VARIABLE PLATFORM_XCODE_VERSION
ERROR_QUIET
OUTPUT_STRIP_TRAILING_WHITESPACE)
string(REGEX MATCH "Xcode [0-9\\.]+" PLATFORM_XCODE_VERSION "${PLATFORM_XCODE_VERSION}")
string(REGEX REPLACE "Xcode ([0-9\\.]+)" "\\1" PLATFORM_XCODE_VERSION "${PLATFORM_XCODE_VERSION}")
message(STATUS "Building with Xcode version: ${PLATFORM_XCODE_VERSION}")
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
set(PLATFORM_LINUX 1)
set(PLATFORM_NAME "Linux")
Expand Down
2 changes: 2 additions & 0 deletions includes/rtm/impl/bit_cast.impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
#include "rtm/impl/compiler_utils.h"
#include "rtm/impl/detect_cpp_version.h"

// See config.h for details on how to configure std::bit_cast for your project

// Use RTM_NO_BIT_CAST to disable std::bit_cast
#if RTM_CPP_VERSION >= RTM_CPP_VERSION_20 && !defined(RTM_NO_BIT_CAST)
#include <bit>
Expand Down
Loading