diff --git a/config/LibraryDefine.cmake b/config/LibraryDefine.cmake index a507d0e2..1af1cca4 100644 --- a/config/LibraryDefine.cmake +++ b/config/LibraryDefine.cmake @@ -87,11 +87,12 @@ function(IMATH_DEFINE_LIBRARY libname) if (IMATH_BUILD_APPLE_FRAMEWORKS) set_target_properties(${libname} PROPERTIES FRAMEWORK TRUE - FRAMEWORK_VERSION IMATH_LIB_VERSION - XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER com.AcademySoftwareFoundation.${libname} - MACOSX_FRAMEWORK_IDENTIFIER com.AcademySoftwareFoundation.${libname} - MACOSX_FRAMEWORK_BUNDLE_VERSION IMATH_LIB_VERSION - MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${Imath_VERSION}) + OUTPUT_NAME "${libname}" + FRAMEWORK_VERSION "${IMATH_LIB_VERSION}" + XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "github.com/AcademySoftwareFoundation/Imath/${libname}" + MACOSX_FRAMEWORK_IDENTIFIER "github.com/AcademySoftwareFoundation/Imath/${libname}" + MACOSX_FRAMEWORK_BUNDLE_VERSION "${IMATH_LIB_VERSION}" + MACOSX_FRAMEWORK_SHORT_VERSION_STRING "${Imath_VERSION}") endif() if (IMATH_INSTALL) @@ -112,6 +113,7 @@ function(IMATH_DEFINE_LIBRARY libname) PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${IMATH_OUTPUT_SUBDIR} ) + if(BUILD_SHARED_LIBS AND (NOT "${IMATH_LIB_SUFFIX}" STREQUAL "") AND IMATH_INSTALL_SYM_LINK) string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${IMATH_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) diff --git a/src/Imath/CMakeLists.txt b/src/Imath/CMakeLists.txt index ef500115..8f654795 100644 --- a/src/Imath/CMakeLists.txt +++ b/src/Imath/CMakeLists.txt @@ -51,10 +51,10 @@ imath_define_library(Imath if(IMATH_BUILD_APPLE_FRAMEWORKS) set_target_properties(Imath PROPERTIES FRAMEWORK TRUE - FRAMEWORK_VERSION IMATH_LIB_VERSION - XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER github.com/AcademySoftwareFoundation/Imath - OUTPUT_NAME "imath" - MACOSX_FRAMEWORK_IDENTIFIER github.com/AcademySoftwareFoundation/Imath - MACOSX_FRAMEWORK_BUNDLE_VERSION IMATH_LIB_VERSION - MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${Imath_VERSION}) + FRAMEWORK_VERSION "${IMATH_LIB_VERSION}" + XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "github.com/AcademySoftwareFoundation/Imath" + OUTPUT_NAME "Imath" + MACOSX_FRAMEWORK_IDENTIFIER "github.com/AcademySoftwareFoundation/Imath" + MACOSX_FRAMEWORK_BUNDLE_VERSION "${IMATH_LIB_VERSION}" + MACOSX_FRAMEWORK_SHORT_VERSION_STRING "${Imath_VERSION}") endif() diff --git a/src/pybind11/PyBindImath/CMakeLists.txt b/src/pybind11/PyBindImath/CMakeLists.txt index 511abb86..46143dd3 100644 --- a/src/pybind11/PyBindImath/CMakeLists.txt +++ b/src/pybind11/PyBindImath/CMakeLists.txt @@ -114,10 +114,10 @@ endif() if(IMATH_BUILD_APPLE_FRAMEWORKS) set_target_properties(${PYBINDIMATH_LIBRARY} PROPERTIES FRAMEWORK TRUE - FRAMEWORK_VERSION PYBINDIMATH_LIB_SUFFIX - XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER github.com/AcademySoftwareFoundation/Imath.PyBind - # OUTPUT_NAME "pybind" - MACOSX_FRAMEWORK_IDENTIFIER github.com/AcademySoftwareFoundation/Imath.PyBind - MACOSX_FRAMEWORK_BUNDLE_VERSION PYBINDIMATH_LIB_SUFFIX - MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${Imath_VERSION}) + FRAMEWORK_VERSION "${PYBINDIMATH_LIB_SUFFIX}" + XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "github.com/AcademySoftwareFoundation/Imath/PyBind" + OUTPUT_NAME "pybind" + MACOSX_FRAMEWORK_IDENTIFIER "github.com/AcademySoftwareFoundation/Imath/PyBind" + MACOSX_FRAMEWORK_BUNDLE_VERSION "${PYBINDIMATH_LIB_SUFFIX}" + MACOSX_FRAMEWORK_SHORT_VERSION_STRING "${Imath_VERSION}") endif() \ No newline at end of file