External, Non-PPA KXStudio Repository
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

99 lines
4.2KB

  1. diff --git a/extras/Build/CMake/JUCEConfig.cmake.in b/extras/Build/CMake/JUCEConfig.cmake.in
  2. index 3e5c97de5..5609fa7bd 100644
  3. --- a/extras/Build/CMake/JUCEConfig.cmake.in
  4. +++ b/extras/Build/CMake/JUCEConfig.cmake.in
  5. @@ -20,10 +20,12 @@
  6. @PACKAGE_INIT@
  7. -if(NOT TARGET juce::juceaide)
  8. - add_executable(juce::juceaide IMPORTED)
  9. - set_target_properties(juce::juceaide PROPERTIES
  10. - IMPORTED_LOCATION "@PACKAGE_JUCEAIDE_PATH@")
  11. +set(PACKAGE_PREFIX_DIR "@CMAKE_INSTALL_PREFIX@")
  12. +
  13. +if(NOT TARGET juceaide6)
  14. + add_executable(juceaide6 IMPORTED)
  15. + set_target_properties(juceaide6 PROPERTIES
  16. + IMPORTED_LOCATION "${PACKAGE_PREFIX_DIR}/bin/juceaide6")
  17. endif()
  18. check_required_components("@PROJECT_NAME@")
  19. diff --git a/extras/Build/CMake/JUCEUtils.cmake b/extras/Build/CMake/JUCEUtils.cmake
  20. index 1d8408ebc..8c6a253fe 100644
  21. --- a/extras/Build/CMake/JUCEUtils.cmake
  22. +++ b/extras/Build/CMake/JUCEUtils.cmake
  23. @@ -419,7 +419,7 @@ function(_juce_add_au_resource_fork shared_code_target au_target)
  24. # In the end, it's simplest to generate a special single-purpose appconfig just for the
  25. # resource compiler.
  26. add_custom_command(OUTPUT "${secret_au_plugindefines}"
  27. - COMMAND juce::juceaide auplugindefines "${defs_file}" "${secret_au_plugindefines}"
  28. + COMMAND juceaide6 auplugindefines "${defs_file}" "${secret_au_plugindefines}"
  29. DEPENDS "${defs_file}"
  30. VERBATIM)
  31. @@ -861,7 +861,7 @@ function(juce_add_binary_data target)
  32. list(APPEND binary_file_names "${juce_binary_data_folder}/${JUCE_ARG_HEADER_NAME}")
  33. add_custom_command(OUTPUT ${binary_file_names}
  34. - COMMAND juce::juceaide binarydata "${JUCE_ARG_NAMESPACE}" "${JUCE_ARG_HEADER_NAME}"
  35. + COMMAND juceaide6 binarydata "${JUCE_ARG_NAMESPACE}" "${JUCE_ARG_HEADER_NAME}"
  36. ${juce_binary_data_folder} ${JUCE_ARG_SOURCES}
  37. WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
  38. DEPENDS ${JUCE_ARG_SOURCES}
  39. @@ -958,7 +958,7 @@ function(juce_generate_juce_header target)
  40. set(extra_args)
  41. add_custom_command(OUTPUT "${juce_header}"
  42. - COMMAND juce::juceaide header "${defs_file}" "${juce_header}" ${extra_args}
  43. + COMMAND juceaide6 header "${defs_file}" "${juce_header}" ${extra_args}
  44. DEPENDS "${defs_file}"
  45. VERBATIM)
  46. endfunction()
  47. @@ -966,20 +966,20 @@ endfunction()
  48. # ==================================================================================================
  49. function(_juce_execute_juceaide)
  50. - if(NOT TARGET juce::juceaide)
  51. - message(FATAL_ERROR "The juceaide target does not exist")
  52. + if(NOT TARGET juceaide6)
  53. + message(FATAL_ERROR "The juceaide6 target does not exist")
  54. endif()
  55. - get_target_property(juceaide_location juce::juceaide IMPORTED_LOCATION)
  56. + get_target_property(juceaide6_location juceaide6 IMPORTED_LOCATION)
  57. - if(NOT EXISTS "${juceaide_location}")
  58. - message(FATAL_ERROR "juceaide was imported, but it doesn't exist!")
  59. + if(NOT EXISTS "${juceaide6_location}")
  60. + message(FATAL_ERROR "juceaide6 was imported, but it doesn't exist!")
  61. endif()
  62. - execute_process(COMMAND "${juceaide_location}" ${ARGN} RESULT_VARIABLE result_variable)
  63. + execute_process(COMMAND "${juceaide6_location}" ${ARGN} RESULT_VARIABLE result_variable)
  64. if(result_variable)
  65. - message(FATAL_ERROR "Running juceaide failed")
  66. + message(FATAL_ERROR "Running juceaide6 failed")
  67. endif()
  68. endfunction()
  69. @@ -1100,7 +1100,7 @@ function(_juce_configure_bundle source_target dest_target)
  70. MACOSX_BUNDLE_INFO_PLIST "${this_output_plist}")
  71. add_custom_command(OUTPUT "${this_output_pkginfo}"
  72. - COMMAND juce::juceaide pkginfo "${juce_kind_string}" "${this_output_pkginfo}"
  73. + COMMAND juceaide6 pkginfo "${juce_kind_string}" "${this_output_pkginfo}"
  74. VERBATIM)
  75. set(output_folder "$<TARGET_BUNDLE_CONTENT_DIR:${dest_target}>")
  76. @@ -1192,7 +1192,7 @@ function(_juce_add_resources_rc source_target dest_target)
  77. set(resource_rc_file "${juce_library_code}/resources.rc")
  78. add_custom_command(OUTPUT "${resource_rc_file}"
  79. - COMMAND juce::juceaide rcfile "${input_info_file}" "${resource_rc_file}"
  80. + COMMAND juceaide6 rcfile "${input_info_file}" "${resource_rc_file}"
  81. ${dependency}
  82. VERBATIM)