Set OMR_MIXED_REFERENCES_MODE_STATIC for easier static mode checks

Signed-off-by: Sharon Wang <[email protected]>

Author: sharon-wang

cmake/config.cmake

@@ -171,8 +171,9 @@ elseif(OMR_GC_POINTER_MODE STREQUAL "mixed")
 	omr_assert(FATAL_ERROR TEST NOT OMR_ENV_DATA32 MESSAGE "OMR_GC_POINTER_MODE must be \"full\" on 32 bit platforms")
 	set(OMR_GC_COMPRESSED_POINTERS ON CACHE INTERNAL "")
 	set(OMR_GC_FULL_POINTERS ON CACHE INTERNAL "")
-	# OMR_MIXED_REFERENCES_MODE should already be set to 'static' or 'dynamic', but a default is provided here
-	set(OMR_MIXED_REFERENCES_MODE "static" CACHE STRING "")
+	if(OMR_MIXED_REFERENCES_MODE STREQUAL "static")
+		set(OMR_MIXED_REFERENCES_MODE_STATIC ON CACHE INTERNAL "")
+	endif()
 else()
 	message(FATAL_ERROR "OMR_GC_FULL_POINTERS must be set to one of \"full\", \"compressed\", or \"mixed\"")
 endif()

gc/CMakeLists.txt

@@ -440,7 +440,7 @@ target_link_libraries(omrgc
 )
 set_target_properties(omrgc omrgc_hookgen omrgc_tracegen PROPERTIES FOLDER gc)
 
-if(OMR_MIXED_REFERENCES_MODE STREQUAL "static")
+if(OMR_MIXED_REFERENCES_MODE_STATIC)
 	target_compile_definitions(omrgc PUBLIC -DOMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES=1)
 
 	omr_assert(

gc/api/CMakeLists.txt

@@ -54,7 +54,7 @@ target_compile_features(omrgc
 		${gc_compile_features}
 )
 
-if(OMR_MIXED_REFERENCES_MODE STREQUAL "static")
+if(OMR_MIXED_REFERENCES_MODE_STATIC)
 	target_include_directories(omrgc_full
 		PUBLIC
 			${gc_include_directories}