Additional adjustments to names of variables populated in macros

Check for ASAN library when using clang ASAN/UBSAN so it can be used via DYLD_INSERT_LIBRARIES for Python tests

Author: langmm

CHANGELOG.md

@@ -11,6 +11,11 @@ Because YggdrasilRapidJSON continues to merge updates from RapidJSON, the RapidJ
 * Fix bug where version could not be set in the conda recipe build since it is created from a tar instead of the git repo
 * Fix bug where asan flags were added to list that could be used for Fortran, but are only valid for C or CXX
 
+### Maintenance
+* Update names of flag/library lists set based on options to adhere to pattern of <PREFIX>_PUBLIC/PRIVATE_<SUFFIX>
+* Check for ASAN library and store it in <PREFIX>_ASAN_LIB when using clang ASAN/UBSAN so it can be used via DYLD_INSERT_LIBRARIES for Python tests
+* Added cmake macros yggdrasil_rapidjson_target_config and yggdrasil_rapidjson_global_config for adding option based flags to a target or the current scope (and subscopes)
+
 ## 1.1.0.3 - 2026-05-29
 
 ### Maintenance

CMakeLists.txt

@@ -46,11 +46,11 @@ option(YGGDRASIL_RAPIDJSON_SCHEMA_TESTS "Build tests using the yggdrasil schema"
 set(INTERFACE_PUBLIC_COMPILE_FLAGS -D_USE_MATH_DEFINES)
 set(INTERFACE_PUBLIC_LINK_FLAGS)
 set(INTERFACE_INCLUDE_DIRS)
-set(INTERFACE_LIBRARIES)
+set(INTERFACE_PUBLIC_LIBRARIES)
 set(LOCAL_PUBLIC_COMPILE_FLAGS)
 set(LOCAL_PUBLIC_LINK_FLAGS)
 set(LOCAL_INCLUDE_DIRS)
-set(LOCAL_LIBRARIES)
+set(LOCAL_PUBLIC_LIBRARIES)
 
 if(DISABLE_YGGDRASIL_RAPIDJSON)
   set(RAPIDJSON_CREATE_METASCHEMA OFF)
@@ -74,9 +74,6 @@ if(NOT (YGGDRASIL_DISABLE_PYTHON_C_API OR DISABLE_YGGDRASIL_RAPIDJSON))
     message(STATUS "Python executable is ${Python3_EXECUTABLE}")
     set(CONDA_PREFIX "$ENV{CONDA_PREFIX}")
     message(STATUS "CONDA_PREFIX = ${CONDA_PREFIX}")
-    if(FOR_CONDA_RECIPE AND NOT CONDA_PREFIX)
-        message(FATAL_ERROR "CONDA_PREFIX is not set, but FOR_CONDA_RECIPE is")
-    endif()
     if(CONDA_PREFIX AND NOT Python3_ROOT_DIR)
         set(Python3_ROOT_DIR "${CONDA_PREFIX}")
     endif()
@@ -290,29 +287,16 @@ else()
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
     )
 endif()
-target_compile_options(
-    ${PROJECT_NAME} INTERFACE ${INTERFACE_PUBLIC_COMPILE_FLAGS}
-)
-target_link_options(
-    ${PROJECT_NAME} INTERFACE ${INTERFACE_PUBLIC_LINK_FLAGS}
-)
-target_include_directories(
-    ${PROJECT_NAME} INTERFACE ${INTERFACE_INCLUDE_DIRS}
-)
-target_link_libraries(
-    ${PROJECT_NAME} INTERFACE ${INTERFACE_LIBRARIES}
-)
+yggdrasil_rapidjson_target_config(${PROJECT_NAME} INTERFACE INTERFACE)
 
 # Set after interface library created
 
 list(
   APPEND EXTRA_CXX_FLAGS
   ${LOCAL_PUBLIC_COMPILE_FLAGS} ${LOCAL_PUBLIC_CXX_FLAGS}
 )
-add_compile_options(${LOCAL_PUBLIC_COMPILE_FLAGS} ${LOCAL_PUBLIC_CXX_FLAGS})
-add_link_options(${LOCAL_PUBLIC_LINK_FLAGS} ${LOCAL_PUBLIC_CXX_LINK_FLAGS})
-include_directories(${LOCAL_INCLUDE_DIRS})
-link_libraries(${PROJECT_NAME} ${LOCAL_LIBRARIES})
+link_libraries(${PROJECT_NAME})
+yggdrasil_rapidjson_global_config(CXX LOCAL)
 
 if(YGGDRASIL_RAPIDJSON_BUILD_DOC)
     add_subdirectory(doc)

YggdrasilRapidJSONConfig.cmake.in

@@ -28,25 +28,15 @@ get_target_property(
 list(GET @PROJECT_NAME@_INCLUDE_DIR 0 @PROJECT_NAME@_INCLUDE_DIR)
 
 set(INTERFACE_LIBRARIES)
-set(INTERFACE_COMPILATION_OPTIONS)
+set(INTERFACE_PUBLIC_COMPILE_FLAGS)
 
 if(NOT (YGGDRASIL_DISABLE_PYTHON_C_API OR DISABLE_YGGDRASIL_RAPIDJSON))
   include(CMakeFindDependencyMacro)
   find_dependency(Python3 COMPONENTS Interpreter Development NumPy)
 endif()
 
 yggdrasil_rapidjson_options_config(INTERFACE)
-
-if(INTERFACE_LIBRARIES)
-  target_link_libraries(
-    @PROJECT_NAME@ INTERFACE ${INTERFACE_LIBRARIES}
-  )
-endif()
-if(INTERFACE_COMPILATION_OPTIONS)
-  target_compile_options(
-    @PROJECT_NAME@ INTERFACE ${INTERFACE_COMPILATION_OPTIONS}
-  )
-endif()
+yggdrasil_rapidjson_target_config(@PROJECT_NAME@ INTERFACE INTERFACE)
 
 set_and_check(
   @PROJECT_NAME@_INCLUDE_DIRS "${@PROJECT_NAME@_INCLUDE_DIR}"

YggdrasilRapidJSONMacros.cmake

@@ -27,6 +27,57 @@ macro(yggdrasil_rapidjson_options_create)
   option(YGGDRASIL_RAPIDJSON_ENABLE_INSTRUMENTATION_OPT "Build yggdrasil_rapidjson with -march or -mcpu options" ON)
 endmacro()
 
+macro(yggdrasil_rapidjson_global_config LANGUAGE PREFIX)
+  add_compile_options(
+    ${${PREFIX}_PUBLIC_COMPILE_FLAGS}
+    ${${PREFIX}_PUBLIC_${LANGUAGE}_FLAGS}
+  )
+  add_link_options(
+    ${${PREFIX}_PUBLIC_LINK_FLAGS}
+    ${${PREFIX}_PUBLIC_${LANGUAGE}_LINK_FLAGS}
+  )
+  include_directories(${${PREFIX}_INCLUDE_DIRS})
+  link_libraries(${${PREFIX}_PUBLIC_LIBRARIES})
+endmacro()
+
+macro(yggdrasil_rapidjson_target_config TARGET TYPE PREFIX)
+  target_link_libraries(
+    ${TARGET} ${TYPE} ${${PREFIX}_PUBLIC_LIBRARIES}
+    "$<$<LINK_LANGUAGE:C>:${${PREFIX}_PUBLIC_C_LIBS}>"
+    "$<$<LINK_LANGUAGE:CXX>:${${PREFIX}_PUBLIC_CXX_LIBS}>"
+    "$<$<LINK_LANGUAGE:Fortran>:${${PREFIX}_PUBLIC_Fortran_LIBS}>"
+  )
+  target_include_directories(
+    ${TARGET} ${TYPE} ${${PREFIX}_INCLUDE_DIRS}
+  )
+  target_compile_options(
+    ${TARGET} ${TYPE} ${${PREFIX}_PUBLIC_COMPILE_FLAGS}
+    "$<$<COMPILE_LANGUAGE:C>:${${PREFIX}_PUBLIC_C_COMPILE_FLAGS}>"
+    "$<$<COMPILE_LANGUAGE:CXX>:${${PREFIX}_PUBLIC_CXX_COMPILE_FLAGS}>"
+    "$<$<COMPILE_LANGUAGE:Fortran>:${${PREFIX}_PUBLIC_Fortran_COMPILE_FLAGS}>"
+  )
+  target_link_options(
+    ${TARGET} ${TYPE} ${${PREFIX}_PUBLIC_LINK_FLAGS}
+    "$<$<LINK_LANGUAGE:C>:${${PREFIX}_PUBLIC_C_LINK_FLAGS}>"
+    "$<$<LINK_LANGUAGE:CXX>:${${PREFIX}_PUBLIC_CXX_LINK_FLAGS}>"
+    "$<$<LINK_LANGUAGE:Fortran>:${${PREFIX}_PUBLIC_Fortran_LINK_FLAGS}>"
+  )
+  if(NOT TYPE STREQUAL "INTERFACE")
+    target_link_libraries(
+      ${TARGET} ${TYPE} ${${PREFIX}_PRIVATE_LIBRARIES}
+    )
+    # target_include_directories(
+    #   ${TARGET} ${TYPE} ${${PREFIX}_INCLUDE_DIRS_PRIVATE}
+    # )
+    # target_compile_options(
+    #   ${TARGET} ${TYPE} ${${PREFIX}_PRIVATE_COMPILE_FLAGS}
+    # )
+    # target_link_options(
+    #   ${TARGET} ${TYPE} ${${PREFIX}_PRIVATE_LINK_FLAGS}
+    # )
+  endif()
+endmacro()
+
 macro(yggdrasil_rapidjson_options_config OUTPUT_PREFIX)
   if(DISABLE_YGGDRASIL_RAPIDJSON)
     list(
@@ -51,9 +102,9 @@ macro(yggdrasil_rapidjson_options_config OUTPUT_PREFIX)
       )
     else()
       if(NOT YGGDRASIL_RAPIDJSON_PYTHON_WRAPPER)
-        list(APPEND ${OUTPUT_PREFIX}_LIBRARIES Python3::Python)
+        list(APPEND ${OUTPUT_PREFIX}_PUBLIC_LIBRARIES Python3::Python)
       endif()
-      list(APPEND ${OUTPUT_PREFIX}_LIBRARIES Python3::NumPy)
+      list(APPEND ${OUTPUT_PREFIX}_PUBLIC_LIBRARIES Python3::NumPy)
       list(
           APPEND ${OUTPUT_PREFIX}_PUBLIC_COMPILE_FLAGS
           -DNPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
@@ -81,60 +132,57 @@ macro(yggdrasil_rapidjson_options_config OUTPUT_PREFIX)
       -DYGGDRASIL_RAPIDJSON_PYTHON_WRAPPER
     )
   endif()
-  if(YGGDRASIL_RAPIDJSON_BUILD_UBSAN)
+  if(YGGDRASIL_RAPIDJSON_BUILD_ASAN)
     if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
       if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.8.0")
         message(FATAL_ERROR "GCC < 4.8 doesn't support the address sanitizer")
       else()
 	list(APPEND ${OUTPUT_PREFIX}_ASAN_COMPILE_FLAGS -fsanitize=address)
-	list(APPEND ${OUTPUT_PREFIX}_ASAN_LINK_FLAGS -fsanitize=address)
       endif()
     elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
       list(APPEND ${OUTPUT_PREFIX}_ASAN_COMPILE_FLAGS -fsanitize=address)
-      list(APPEND ${OUTPUT_PREFIX}_ASAN_LINK_FLAGS -fsanitize=address)
     else()
       message(FATAL_ERROR "ASAN unsupported by compiler ${CMAKE_CXX_COMPILER_ID}")
     endif()
   endif()
-  if(YGGDRASIL_RAPIDJSON_BUILD_ASAN)
+  if(YGGDRASIL_RAPIDJSON_BUILD_UBSAN)
     if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
       if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9.0")
         message(FATAL_ERROR "GCC < 4.9 doesn't support the undefined behavior sanitizer")
       else()
         list(APPEND ${OUTPUT_PREFIX}_ASAN_COMPILE_FLAGS -fsanitize=undefined)
-        list(APPEND ${OUTPUT_PREFIX}_ASAN_LINK_FLAGS -fsanitize=undefined)
       endif()
     elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
       if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
         list(APPEND ${OUTPUT_PREFIX}_ASAN_COMPILE_FLAGS -fsanitize=undefined-trap -fsanitize-undefined-trap-on-error)
-        list(APPEND ${OUTPUT_PREFIX}_ASAN_LINK_FLAGS -fsanitize=undefined-trap -fsanitize-undefined-trap-on-error)
       else()
         list(APPEND ${OUTPUT_PREFIX}_ASAN_COMPILE_FLAGS -fsanitize=undefined)
-        list(APPEND ${OUTPUT_PREFIX}_ASAN_LINK_FLAGS -fsanitize=undefined)
       endif()
     else()
       message(FATAL_ERROR "UBSAN unsupported by compiler ${CMAKE_CXX_COMPILER_ID}")
     endif()
   endif()
-  if(${OUTPUT_PREFIX}_ASAN_COMPILE_FLAGS)
-    list(
-      APPEND ${OUTPUT_PREFIX}_PUBLIC_C_COMPILE_FLAGS
-      ${${OUTPUT_PREFIX}_ASAN_COMPILE_FLAGS}
-    )
-    list(
-      APPEND ${OUTPUT_PREFIX}_PUBLIC_CXX_COMPILE_FLAGS
-      ${${OUTPUT_PREFIX}_ASAN_COMPILE_FLAGS}
+  if(YGGDRASIL_RAPIDJSON_BUILD_ASAN OR YGGDRASIL_RAPIDJSON_BUILD_UBSAN
+     AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    execute_process(
+      COMMAND ${CMAKE_CXX_COMPILER} -print-file-name=libclang_rt.asan_osx_dynamic.dylib
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+      OUTPUT_VARIABLE ${OUTPUT_PREFIX}_ASAN_LIB
+      RESULT_VARIABLE ${OUTPUT_PREFIX}_ASAN_RESULT
     )
+    if(${OUTPUT_PREFIX}_ASAN_RESULT)
+      set(${OUTPUT_PREFIX}_ASAN_LIB)
+    endif()
   endif()
-  if(${OUTPUT_PREFIX}_ASAN_LINK_FLAGS)
-    list(
-      APPEND ${OUTPUT_PREFIX}_PUBLIC_C_LINK_FLAGS
-      ${${OUTPUT_PREFIX}_ASAN_COMPILE_FLAGS}
-    )
-    list(
-      APPEND ${OUTPUT_PREFIX}_PUBLIC_CXX_LINK_FLAGS
-      ${${OUTPUT_PREFIX}_ASAN_COMPILE_FLAGS}
-    )
+  if(${OUTPUT_PREFIX}_ASAN_COMPILE_FLAGS)
+    # Compilation flags are same as link flags for ASAN & UBSAN
+    foreach(suffix PUBLIC_C_COMPILE_FLAGS PUBLIC_CXX_COMPILE_FLAGS
+            PUBLIC_C_LINK_FLAGS PUBLIC_CXX_LINK_FLAGS)
+      list(
+        APPEND ${OUTPUT_PREFIX}_${suffix}
+        ${${OUTPUT_PREFIX}_ASAN_COMPILE_FLAGS}
+      )
+    endforeach()
   endif()
 
   if(YGGDRASIL_RAPIDJSON_ENABLE_INSTRUMENTATION_OPT