ThrowTheSwitch/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2026-08-16 08:07:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #823 from Dariqq/UNITY_SUPPORT64

Browse Source 
Add option for UNITY_SUPPORT_64
This commit is contained in:
Mark VanderVoord
2026-03-20 19:41:58 -04:00
committed by GitHub
parent cdfc44eaf3 29451d61b5
commit d3d348fe51
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+10
View File
@@ -44,6 +44,7 @@ project(unity
# Options to Build With Extras ------------------------------------------------- # Options to Build With Extras -------------------------------------------------
option(UNITY_EXTENSION_FIXTURE "Compiles Unity with the \"fixture\" extension." OFF) option(UNITY_EXTENSION_FIXTURE "Compiles Unity with the \"fixture\" extension." OFF)
option(UNITY_EXTENSION_MEMORY "Compiles Unity with the \"memory\" extension." OFF) option(UNITY_EXTENSION_MEMORY "Compiles Unity with the \"memory\" extension." OFF)
option(UNITY_SUPPORT_INT64 "Enable 64bit integer support. OFF means autodetect." OFF)
set(UNITY_EXTENSION_FIXTURE_ENABLED $<BOOL:${UNITY_EXTENSION_FIXTURE}>) set(UNITY_EXTENSION_FIXTURE_ENABLED $<BOOL:${UNITY_EXTENSION_FIXTURE}>)
set(UNITY_EXTENSION_MEMORY_ENABLED $<OR:${UNITY_EXTENSION_FIXTURE_ENABLED},$<BOOL:${UNITY_EXTENSION_MEMORY}>>) set(UNITY_EXTENSION_MEMORY_ENABLED $<OR:${UNITY_EXTENSION_FIXTURE_ENABLED},$<BOOL:${UNITY_EXTENSION_MEMORY}>>)
@@ -56,6 +57,10 @@ if(${UNITY_EXTENSION_MEMORY})
message(STATUS "Unity: Building with the memory extension.") message(STATUS "Unity: Building with the memory extension.")
endif() endif()
if(${UNITY_SUPPORT_INT64})
message(STATUS "Unity: Building with 64bit integer support.")
endif()
# Main target ------------------------------------------------------------------ # Main target ------------------------------------------------------------------
add_library(${PROJECT_NAME} STATIC) add_library(${PROJECT_NAME} STATIC)
add_library(${PROJECT_NAME}::framework ALIAS ${PROJECT_NAME}) add_library(${PROJECT_NAME}::framework ALIAS ${PROJECT_NAME})
@@ -89,6 +94,11 @@ set(${PROJECT_NAME}_PUBLIC_HEADERS
$<$<BOOL:${UNITY_EXTENSION_MEMORY_ENABLED}>:${CMAKE_CURRENT_SOURCE_DIR}/extras/memory/src/unity_memory.h> $<$<BOOL:${UNITY_EXTENSION_MEMORY_ENABLED}>:${CMAKE_CURRENT_SOURCE_DIR}/extras/memory/src/unity_memory.h>
) )
target_compile_definitions(${PROJECT_NAME}
PUBLIC
$<$<BOOL:${UNITY_SUPPORT_INT64}>:UNITY_SUPPORT_64>
)
set_target_properties(${PROJECT_NAME} set_target_properties(${PROJECT_NAME}
PROPERTIES PROPERTIES
C_STANDARD 11 C_STANDARD 11
meson.build
+5
View File
@@ -26,6 +26,7 @@ project('unity', 'c',
build_fixture = get_option('extension_fixture') build_fixture = get_option('extension_fixture')
build_memory = get_option('extension_memory') build_memory = get_option('extension_memory')
support_double = get_option('support_double') support_double = get_option('support_double')
support_int64 = get_option('support_int64')
fixture_help_message = get_option('fixture_help_message') fixture_help_message = get_option('fixture_help_message')
unity_args = [] unity_args = []
@@ -51,6 +52,10 @@ if support_double
unity_args += '-DUNITY_INCLUDE_DOUBLE' unity_args += '-DUNITY_INCLUDE_DOUBLE'
endif endif
if support_int64
unity_args += '-DUNITY_SUPPORT_64'
endif
unity_lib = static_library(meson.project_name(), unity_lib = static_library(meson.project_name(),
sources: unity_src, sources: unity_src,
c_args: unity_args, c_args: unity_args,
meson_options.txt
+1
View File
@@ -1,4 +1,5 @@
option('extension_fixture', type: 'boolean', value: false, description: 'Whether to enable the fixture extension.') option('extension_fixture', type: 'boolean', value: false, description: 'Whether to enable the fixture extension.')
option('extension_memory', type: 'feature', value: 'auto', description: 'Whether to enable the memory extension. By default this is automatically enabled when extension_fixture is enabled.') option('extension_memory', type: 'feature', value: 'auto', description: 'Whether to enable the memory extension. By default this is automatically enabled when extension_fixture is enabled.')
option('support_double', type: 'boolean', value: false, description: 'Whether to enable double precision floating point assertions.') option('support_double', type: 'boolean', value: false, description: 'Whether to enable double precision floating point assertions.')
option('support_int64', type: 'boolean', value: false, description: 'Whether to enable support for 64bit integers. false means autodetect.')
option('fixture_help_message', type: 'string', description: 'If the fixture extension is enabled, this allows a custom help message to be defined.') option('fixture_help_message', type: 'string', description: 'If the fixture extension is enabled, this allows a custom help message to be defined.')