mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

CMake: Allow custom header names for BinaryData targets

Browse source 
This change helps to avoid ambiguity in includes when building projects
which contain more than one "BinaryData.h".
This commit is contained in:
reuk 2020-04-25 16:54:31 +01:00
parent d817519f39
commit 0a2e4191b3
3 changed files with 39 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

22
extras/Build/CMake/JUCEUtils.cmake
View file

@ -694,7 +694,7 @@ endfunction()
# ==================================================================================================
function(juce_add_binary_data target)
set(one_value_args NAMESPACE)
set(one_value_args NAMESPACE HEADER_NAME)
set(multi_value_args SOURCES)
cmake_parse_arguments(JUCE_ARG "" "${one_value_args}" "${multi_value_args}" ${ARGN})
@ -716,19 +716,27 @@ function(juce_add_binary_data target)
file(MAKE_DIRECTORY ${juce_binary_data_folder})
if(JUCE_ARG_NAMESPACE)
set(namespace_opt --namespace=${JUCE_ARG_NAMESPACE})
if(NOT JUCE_ARG_NAMESPACE)
set(JUCE_ARG_NAMESPACE BinaryData)
endif()
if(NOT JUCE_ARG_HEADER_NAME)
set(JUCE_ARG_HEADER_NAME BinaryData.h)
endif()
add_custom_command(OUTPUT ${binary_file_names}
COMMAND juce::juceaide binarydata ${namespace_opt} ${juce_binary_data_folder} ${JUCE_ARG_SOURCES}
COMMAND juce::juceaide binarydata "${JUCE_ARG_NAMESPACE}" "${JUCE_ARG_HEADER_NAME}"
${juce_binary_data_folder} ${JUCE_ARG_SOURCES}
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
VERBATIM)
target_sources(${target} PRIVATE "${binary_file_names}")
target_compile_definitions(${target} INTERFACE JUCE_TARGET_HAS_BINARY_DATA=1)
target_include_directories(${target} INTERFACE ${juce_binary_data_folder})
target_compile_features(${target} PRIVATE cxx_std_11)
if(JUCE_ARG_HEADER_NAME STREQUAL "BinaryData.h")
target_compile_definitions(${target} INTERFACE JUCE_TARGET_HAS_BINARY_DATA=1)
endif()
endfunction()
# ==================================================================================================
@ -805,8 +813,10 @@ function(juce_generate_juce_header target)
set(defs_file $<GENEX_EVAL:$<TARGET_PROPERTY:${target},JUCE_DEFS_FILE>>)
set(extra_args)
add_custom_command(OUTPUT "${juce_header}"
COMMAND juce::juceaide header "${defs_file}" "${juce_header}"
COMMAND juce::juceaide header "${defs_file}" "${juce_header}" ${extra_args}
DEPENDS "${defs_file}"
VERBATIM)
endfunction()