Add OMR_GC_GLUE_FULL_TARGET handling for mixedrefs static mode

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

Author: sharon-wang

cmake/config.cmake

@@ -116,6 +116,7 @@ set(OMR_TRACE_LIB "omrtrace" CACHE STRING "Name of the trace library to link aga
 ###
 
 set(OMR_GC_GLUE_TARGET "NOTFOUND" CACHE STRING "The gc glue target, must be interface library")
+set(OMR_GC_GLUE_FULL_TARGET "NOTFOUND" CACHE STRING "The gc glue full target, must be interface library")
 set(OMR_UTIL_GLUE_TARGET "NOTFOUND" CACHE STRING "The util glue target, must be interface library")
 set(OMR_RAS_GLUE_TARGET "NOTFOUND" CACHE STRING "The ras glue target, must be interface library")
 set(OMR_CORE_GLUE_TARGET "NOTFOUND" CACHE STRING "The core glue target, must be and interface library")

gc/CMakeLists.txt

@@ -412,22 +412,18 @@ set(gc_include_public
 	verbose
 	verbose/handler_standard
 )
-set(gc_include_interface
-	$<TARGET_PROPERTY:${OMR_GC_GLUE_TARGET},INTERFACE_INCLUDE_DIRECTORIES>
-)
 
 target_include_directories(omrgc
 	PUBLIC
 		${gc_include_public}
 	INTERFACE
-		${gc_include_interface}
+		$<TARGET_PROPERTY:${OMR_GC_GLUE_TARGET},INTERFACE_INCLUDE_DIRECTORIES>
 )
 
 set(gc_link_libraries_public
 	omr_base
 )
 set(gc_link_libraries_private
-	${OMR_GC_GLUE_TARGET}
 	omrutil
 	omrcore
 	${OMR_THREAD_LIB}
@@ -439,13 +435,19 @@ target_link_libraries(omrgc
 	PUBLIC
 		${gc_link_libraries_public}
 	PRIVATE
+		${OMR_GC_GLUE_TARGET}
 		${gc_link_libraries_private}
 )
 set_target_properties(omrgc omrgc_hookgen omrgc_tracegen PROPERTIES FOLDER gc)
 
 if(OMR_MIXED_REFERENCES_MODE STREQUAL "static")
 	target_compile_definitions(omrgc PUBLIC -DOMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES=1)
 
+	omr_assert(
+		TEST OMR_GC_GLUE_FULL_TARGET
+		MESSAGE "OMR_GC_GLUE_TARGET must be set."
+	)
+
 	omr_add_library(omrgc_full STATIC
 		${omrgc_sources}
 	)
@@ -531,13 +533,14 @@ if(OMR_MIXED_REFERENCES_MODE STREQUAL "static")
 		PUBLIC
 			${gc_include_public}
 		INTERFACE
-			${gc_include_interface}
+			$<TARGET_PROPERTY:${OMR_GC_GLUE_FULL_TARGET},INTERFACE_INCLUDE_DIRECTORIES>
 	)
 
 	target_link_libraries(omrgc_full
 		PUBLIC
 			${gc_link_libraries_public}
 		PRIVATE
+			${OMR_GC_GLUE_FULL_TARGET}
 			${gc_link_libraries_private}
 	)
 	set_target_properties(omrgc_full omrgc_hookgen omrgc_tracegen PROPERTIES FOLDER gc)