apple.26

Signed-off-by: Cary Phillips <cary@ilm.com>

Author: cary-ilm

config/CMakeLists.txt

@@ -16,10 +16,18 @@ set(IMATH_CONFIG_DIR "${CMAKE_CURRENT_BINARY_DIR}" CACHE INTERNAL "")
 add_library(ImathConfig INTERFACE)
 add_library(Imath::Config ALIAS ImathConfig)
 
-target_include_directories(ImathConfig INTERFACE
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
-  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${IMATH_OUTPUT_SUBDIR}>)
+if (IMATH_BUILD_APPLE_FRAMEWORK)
+    # apple framework installs includes in Imath.framework/Headers, not include/Imath
+    target_include_directories(ImathConfig INTERFACE
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+        $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/Imath.framework/Headers>
+    )
+else()
+    target_include_directories(ImathConfig INTERFACE
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${IMATH_OUTPUT_SUBDIR}>
+    )
+endif()
 
 if (IMATH_INSTALL)
   install(TARGETS ImathConfig EXPORT Imath)
@@ -71,7 +79,12 @@ set(IMATH_CMAKE_CONFIG_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}
 file(MAKE_DIRECTORY ${IMATH_CMAKE_CONFIG_BUILD_DIR})
 
 if(APPLE AND IMATH_BUILD_APPLE_FRAMEWORK)
-  set(cmake_destination Imath.framework/Versions/${Imath_VERSION_MAJOR}.${Imath_VERSION_MINOR}/Resources/CMake/Imath)
+  # macOS framework versions the Resources and headers, iOS does not
+  if(CMAKE_SYSTEM_NAME STREQUAL "iOS")
+    set(cmake_destination Imath.framework/Resources/CMake/Imath)
+  else()
+    set(cmake_destination Imath.framework/Versions/${Imath_VERSION_MAJOR}.${Imath_VERSION_MINOR}/Resources/CMake/Imath)
+  endif()
 else()
   set(cmake_destination ${CMAKE_INSTALL_LIBDIR}/cmake/Imath)
 endif()
@@ -94,15 +107,4 @@ if (IMATH_INSTALL)
     DESTINATION ${cmake_destination}
   )
 
-  install(EXPORT Imath
-    DESTINATION ${cmake_destination}
-    FILE ImathTargets.cmake
-    NAMESPACE Imath::
-    EXPORT_LINK_INTERFACE_LIBRARIES
-  )
-
-  export(EXPORT Imath
-    FILE "${CMAKE_CURRENT_BINARY_DIR}/ImathTargets.cmake"
-    NAMESPACE Imath::
-  )
 endif()

src/Imath/CMakeLists.txt

@@ -107,7 +107,20 @@ endif()
 
 set_property(TARGET ${IMATH_LIBRARY} PROPERTY PUBLIC_HEADER ${IMATH_HEADERS})
 
-target_include_directories(${IMATH_LIBRARY} INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
+# Includes are installed to "include/Imath", or under Imath.framework/Headers for apple framework
+if (IMATH_BUILD_APPLE_FRAMEWORK)
+    target_include_directories(${IMATH_LIBRARY}
+       PUBLIC
+            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+            $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/Imath.framework/Headers>
+    )
+else()
+    target_include_directories(${IMATH_LIBRARY}
+        INTERFACE
+            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+            $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${IMATH_OUTPUT_SUBDIR}>
+    )
+endif()
 
 #
 # Link options
@@ -122,16 +135,30 @@ if (HAVE_LIB_M)
 endif()
 
 if (IMATH_BUILD_APPLE_FRAMEWORK)
-  set_target_properties(${IMATH_LIBRARY} PROPERTIES 
-    FRAMEWORK TRUE
-    FRAMEWORK_VERSION "${Imath_VERSION_MAJOR}.${Imath_VERSION_MINOR}"
-    XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "org.aswf.Imath"
-    MACOSX_FRAMEWORK_IDENTIFIER "org.aswf.Imath"
-    MACOSX_FRAMEWORK_BUNDLE_VERSION "${IMATH_VERSION}"
-    MACOSX_FRAMEWORK_SHORT_VERSION_STRING "${Imath_VERSION_MAJOR}.${Imath_VERSION_MINOR}"
-    MACOSX_RPATH TRUE
-    RESOURCE "${IMATH_CMAKE_CONFIG_BUILD_DIR}/ImathConfig.cmake;${IMATH_CMAKE_CONFIG_BUILD_DIR}/ImathConfigVersion.cmake"
-  )
+
+  if(CMAKE_SYSTEM_NAME STREQUAL "iOS")
+    # Don't set FRAMEWORK_VERSION for iOS
+    set_target_properties(${IMATH_LIBRARY} PROPERTIES 
+      FRAMEWORK TRUE
+      XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "org.aswf.Imath"
+      MACOSX_FRAMEWORK_IDENTIFIER "org.aswf.Imath"
+      MACOSX_FRAMEWORK_BUNDLE_VERSION "${IMATH_VERSION}"
+      MACOSX_FRAMEWORK_SHORT_VERSION_STRING "${Imath_VERSION_MAJOR}.${Imath_VERSION_MINOR}"
+      MACOSX_RPATH TRUE
+      RESOURCE "${IMATH_CMAKE_CONFIG_BUILD_DIR}/ImathConfig.cmake;${IMATH_CMAKE_CONFIG_BUILD_DIR}/ImathConfigVersion.cmake"
+    )
+  else()
+    set_target_properties(${IMATH_LIBRARY} PROPERTIES 
+      FRAMEWORK TRUE
+      FRAMEWORK_VERSION "${Imath_VERSION_MAJOR}.${Imath_VERSION_MINOR}"
+      XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "org.aswf.Imath"
+      MACOSX_FRAMEWORK_IDENTIFIER "org.aswf.Imath"
+      MACOSX_FRAMEWORK_BUNDLE_VERSION "${IMATH_VERSION}"
+      MACOSX_FRAMEWORK_SHORT_VERSION_STRING "${Imath_VERSION_MAJOR}.${Imath_VERSION_MINOR}"
+      MACOSX_RPATH TRUE
+      RESOURCE "${IMATH_CMAKE_CONFIG_BUILD_DIR}/ImathConfig.cmake;${IMATH_CMAKE_CONFIG_BUILD_DIR}/ImathConfigVersion.cmake"
+    )
+  endif()
 else()
   set_target_properties(${IMATH_LIBRARY} PROPERTIES OUTPUT_NAME "Imath${IMATH_LIB_SUFFIX}" )
 endif()
@@ -142,6 +169,20 @@ endif()
 
 if (IMATH_INSTALL)
 
+  if(APPLE AND IMATH_BUILD_APPLE_FRAMEWORK)
+    if(CMAKE_SYSTEM_NAME STREQUAL "iOS")
+      set(cmake_destination Imath.framework/Resources/CMake/Imath)
+    else()
+      set(cmake_destination Imath.framework/Versions/${Imath_VERSION_MAJOR}.${Imath_VERSION_MINOR}/Resources/CMake/Imath)
+    endif()
+    set(includes_destination Imath.framework/Headers)
+    set(public_header_destination Imath.framework/Headers)
+  else()
+    set(cmake_destination ${CMAKE_INSTALL_LIBDIR}/cmake/Imath)
+    set(includes_destination ${CMAKE_INSTALL_INCLUDEDIR})
+    set(public_header_destination ${CMAKE_INSTALL_INCLUDEDIR}/${IMATH_OUTPUT_SUBDIR})
+  endif()
+
   install(TARGETS ${IMATH_LIBRARY}
     EXPORT Imath
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
@@ -150,8 +191,15 @@ if (IMATH_INSTALL)
     FRAMEWORK DESTINATION ${CMAKE_INSTALL_PREFIX}
       COMPONENT runtime
       OPTIONAL
-    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${IMATH_OUTPUT_SUBDIR}
+    INCLUDES DESTINATION ${includes_destination}
+    PUBLIC_HEADER DESTINATION ${includes_destination}
+  )
+
+  install(EXPORT Imath
+    DESTINATION ${cmake_destination}
+    FILE ImathTargets.cmake
+    NAMESPACE Imath::
+    EXPORT_LINK_INTERFACE_LIBRARIES
   )
 
   if(BUILD_SHARED_LIBS