this repo has no description
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

cmake/darling_framework.cmake: Add IOSSUPPORT argument

Some of the frameworks that Catalyst apps rely on are located in /System/iOSSupport/System/Library/Frameworks. This argument adds the ability to install frameworks within /System/iOSSupport

Thomas A 38ea0998 5285bbef

+25 -13
+25 -13
cmake/darling_framework.cmake
··· 6 6 FULL_DOCS "Used to make reexporting child frameworks less painful.") 7 7 8 8 function(add_framework name) 9 - cmake_parse_arguments(FRAMEWORK "CURRENT_VERSION;FAT;PRIVATE" "VERSION;LINK_FLAGS;PARENT;PARENT_VERSION" 9 + cmake_parse_arguments(FRAMEWORK "CURRENT_VERSION;FAT;PRIVATE;IOSSUPPORT" "VERSION;LINK_FLAGS;PARENT;PARENT_VERSION" 10 10 "SOURCES;DEPENDENCIES;CIRCULAR_DEPENDENCIES;RESOURCES" ${ARGN}) 11 11 if (FRAMEWORK_CURRENT_VERSION) 12 12 set(my_name "${name}") ··· 19 19 else (FRAMEWORK_PRIVATE) 20 20 set(dir_name "Frameworks") 21 21 endif (FRAMEWORK_PRIVATE) 22 + 23 + if (FRAMEWORK_IOSSUPPORT) 24 + set(sys_library_dir "System/iOSSupport/System/Library") 25 + else (FRAMEWORK_IOSSUPPORT) 26 + set(sys_library_dir "System/Library") 27 + endif (FRAMEWORK_IOSSUPPORT) 22 28 23 29 if(DEFINED FRAMEWORK_PARENT) 24 30 if(NOT DEFINED FRAMEWORK_PARENT_VERSION) ··· 26 32 set(FRAMEWORK_PARENT_VERSION "A") 27 33 endif(NOT DEFINED FRAMEWORK_PARENT_VERSION) 28 34 InstallSymlink(Versions/Current/Frameworks 29 - "${CMAKE_INSTALL_PREFIX}/libexec/darling/System/Library/${dir_name}/${FRAMEWORK_PARENT}.framework/Frameworks") 35 + "${CMAKE_INSTALL_PREFIX}/libexec/darling/${sys_library_dir}/${dir_name}/${FRAMEWORK_PARENT}.framework/Frameworks") 30 36 set(dir_name "${dir_name}/${FRAMEWORK_PARENT}.framework/Versions/${FRAMEWORK_PARENT_VERSION}/Frameworks") 31 37 endif(DEFINED FRAMEWORK_PARENT) 32 38 33 - set(DYLIB_INSTALL_NAME "/System/Library/${dir_name}/${name}.framework/Versions/${FRAMEWORK_VERSION}/${name}") 39 + set(DYLIB_INSTALL_NAME "/${sys_library_dir}/${dir_name}/${name}.framework/Versions/${FRAMEWORK_VERSION}/${name}") 34 40 35 41 if (FRAMEWORK_CIRCULAR_DEPENDENCIES) 36 42 if (FRAMEWORK_FAT) ··· 71 77 set_property(TARGET ${my_name} APPEND_STRING PROPERTY LINK_FLAGS " ${FRAMEWORK_LINK_FLAGS}") 72 78 endif (FRAMEWORK_LINK_FLAGS) 73 79 74 - install(TARGETS ${my_name} DESTINATION "libexec/darling/System/Library/${dir_name}/${name}.framework/Versions/${FRAMEWORK_VERSION}/") 80 + install(TARGETS ${my_name} DESTINATION "libexec/darling/${sys_library_dir}/${dir_name}/${name}.framework/Versions/${FRAMEWORK_VERSION}/") 75 81 76 82 if (FRAMEWORK_RESOURCES) 77 83 if (FRAMEWORK_CURRENT_VERSION) 78 - InstallSymlink("Versions/Current/Resources" "${CMAKE_INSTALL_PREFIX}/libexec/darling/System/Library/${dir_name}/${name}.framework/Resources") 84 + InstallSymlink("Versions/Current/Resources" "${CMAKE_INSTALL_PREFIX}/libexec/darling/${sys_library_dir}/${dir_name}/${name}.framework/Resources") 79 85 endif (FRAMEWORK_CURRENT_VERSION) 80 86 while (FRAMEWORK_RESOURCES) 81 87 list(GET FRAMEWORK_RESOURCES 0 res_install_path) ··· 83 89 get_filename_component(res_install_dir ${res_install_path} DIRECTORY) 84 90 get_filename_component(res_install_name ${res_install_path} NAME) 85 91 install(FILES ${res_source_path} 86 - DESTINATION libexec/darling/System/Library/${dir_name}/${name}.framework/Versions/${FRAMEWORK_VERSION}/Resources/${res_install_dir} 92 + DESTINATION libexec/darling/${sys_library_dir}/${dir_name}/${name}.framework/Versions/${FRAMEWORK_VERSION}/Resources/${res_install_dir} 87 93 RENAME ${res_install_name}) 88 94 list(REMOVE_AT FRAMEWORK_RESOURCES 0 1) 89 95 endwhile (FRAMEWORK_RESOURCES) 90 96 endif (FRAMEWORK_RESOURCES) 91 97 92 98 if (FRAMEWORK_CURRENT_VERSION) 93 - InstallSymlink(${FRAMEWORK_VERSION} "${CMAKE_INSTALL_PREFIX}/libexec/darling/System/Library/${dir_name}/${name}.framework/Versions/Current") 94 - InstallSymlink("Versions/Current/${name}" "${CMAKE_INSTALL_PREFIX}/libexec/darling/System/Library/${dir_name}/${name}.framework/${name}") 99 + InstallSymlink(${FRAMEWORK_VERSION} "${CMAKE_INSTALL_PREFIX}/libexec/darling/${sys_library_dir}/${dir_name}/${name}.framework/Versions/Current") 100 + InstallSymlink("Versions/Current/${name}" "${CMAKE_INSTALL_PREFIX}/libexec/darling/${sys_library_dir}/${dir_name}/${name}.framework/${name}") 95 101 endif (FRAMEWORK_CURRENT_VERSION) 96 102 endfunction(add_framework) 97 103 98 104 function(add_separated_framework name) 99 - cmake_parse_arguments(FRAMEWORK "CURRENT_VERSION;PRIVATE" "VERSION;LINK_FLAGS" "SOURCES;ARCHS;DEPENDENCIES;CIRCULAR_DEPENDENCIES" ${ARGN}) 105 + cmake_parse_arguments(FRAMEWORK "CURRENT_VERSION;PRIVATE;IOSSUPPORT" "VERSION;LINK_FLAGS" "SOURCES;ARCHS;DEPENDENCIES;CIRCULAR_DEPENDENCIES" ${ARGN}) 100 106 if (FRAMEWORK_CURRENT_VERSION) 101 107 set(my_name "${name}") 102 108 else (FRAMEWORK_CURRENT_VERSION) ··· 109 115 set(dir_name "Frameworks") 110 116 endif (FRAMEWORK_PRIVATE) 111 117 112 - set(DYLIB_INSTALL_NAME "/System/Library/${dir_name}/${name}.framework/Versions/${FRAMEWORK_VERSION}/${name}") 118 + if (FRAMEWORK_IOSSUPPORT) 119 + set(sys_library_dir "System/iOSSupport/System/Library") 120 + else (FRAMEWORK_IOSSUPPORT) 121 + set(sys_library_dir "System/Library") 122 + endif (FRAMEWORK_IOSSUPPORT) 123 + 124 + set(DYLIB_INSTALL_NAME "/${sys_library_dir}/${dir_name}/${name}.framework/Versions/${FRAMEWORK_VERSION}/${name}") 113 125 114 126 if (TARGET_i386) 115 127 set(DARLING_LIB_i386_ONLY TRUE) ··· 217 229 add_dependencies(${my_name} ${my_name}_x86_64) 218 230 endif (TARGET_i386 AND TARGET_x86_64) 219 231 220 - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${my_name} DESTINATION "libexec/darling/System/Library/${dir_name}/${name}.framework/Versions/${FRAMEWORK_VERSION}/") 232 + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${my_name} DESTINATION "libexec/darling/${sys_library_dir}/${dir_name}/${name}.framework/Versions/${FRAMEWORK_VERSION}/") 221 233 222 234 if (FRAMEWORK_CURRENT_VERSION) 223 - InstallSymlink(${FRAMEWORK_VERSION} "${CMAKE_INSTALL_PREFIX}/libexec/darling/System/Library/${dir_name}/${name}.framework/Versions/Current") 224 - InstallSymlink("Versions/Current/${name}" "${CMAKE_INSTALL_PREFIX}/libexec/darling/System/Library/${dir_name}/${name}.framework/${name}") 235 + InstallSymlink(${FRAMEWORK_VERSION} "${CMAKE_INSTALL_PREFIX}/libexec/darling/${sys_library_dir}/${dir_name}/${name}.framework/Versions/Current") 236 + InstallSymlink("Versions/Current/${name}" "${CMAKE_INSTALL_PREFIX}/libexec/darling/${sys_library_dir}/${dir_name}/${name}.framework/${name}") 225 237 endif (FRAMEWORK_CURRENT_VERSION) 226 238 endfunction(add_separated_framework)