Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove suffix from framework names #466

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Remove suffix from framework names #466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
802895e
Enable Cross-Compilation for iOS.
Treata11 Dec 24, 2024
90ac416
Fix typo
Treata11 Dec 24, 2024
fa43d5b
Ignore macOS finder files
Treata11 Jan 2, 2025
a6c7599
Build: set FRAMEWORK property TRUE for iOS-derived builds before install
Treata11 Jan 3, 2025
70b6dfd
Update Framework properties
Treata11 Jan 16, 2025
f2d5e18
Merge branch 'AcademySoftwareFoundation:main' into main
Treata11 Jan 20, 2025
0e9e405
Build: Remove suffix from framework names
Treata11 Jan 20, 2025
a837d08
Resolved merge conflicts
Treata11 Jan 20, 2025
19ecbfe
Build: Follow naming convention of framework builds
Treata11 Jan 22, 2025
ba28adc
Build: Remove symlinks for framework builds
Treata11 Jan 22, 2025
e8026d1
Merge branch 'AcademySoftwareFoundation:main' into main
Treata11 Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,11 @@ if (APPLE)
option(IMATH_BUILD_APPLE_FRAMEWORKS "Build as Apple Frameworks" OFF)
endif()

# pkg-config is not required for Apple Frameworks
if (IMATH_BUILD_APPLE_FRAMEWORKS)
set(IMATH_INSTALL_SYM_LINK OFF)
endif()

# If you want to use ctest to configure, build and
# upload the results, cmake has builtin support for
# submitting to CDash, or any server who speaks the
Expand Down
25 changes: 15 additions & 10 deletions config/LibraryDefine.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,20 +78,24 @@ function(IMATH_DEFINE_LIBRARY libname)
target_link_libraries(${libname} PUBLIC ${IMATH_EXTRA_LIBS})
endif()

set_target_properties(${libname} PROPERTIES
OUTPUT_NAME "${libname}${IMATH_LIB_SUFFIX}"
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
)
# No vesion-suffixes for Apple Frameworks
if (NOT IMATH_BUILD_APPLE_FRAMEWORKS)
set_target_properties(${libname} PROPERTIES
OUTPUT_NAME "${libname}${IMATH_LIB_SUFFIX}"
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
)
endif()
add_library(${PROJECT_NAME}::${libname} ALIAS ${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})
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}"
MACOSX_RPATH TRUE)
endif()

if (IMATH_INSTALL)
Expand All @@ -112,7 +116,8 @@ 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)

if(BUILD_SHARED_LIBS AND (NOT "${IMATH_LIB_SUFFIX}" STREQUAL "") AND IMATH_INSTALL_SYM_LINK AND NOT IMATH_BUILD_APPLE_FRAMEWORKS)
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})
set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
Expand Down
12 changes: 6 additions & 6 deletions src/Imath/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
MACOSX_FRAMEWORK_IDENTIFIER "github.com/AcademySoftwareFoundation/Imath"
MACOSX_FRAMEWORK_BUNDLE_VERSION "${IMATH_LIB_VERSION}"
MACOSX_FRAMEWORK_SHORT_VERSION_STRING "${Imath_VERSION}"
MACOSX_RPATH TRUE)
endif()
12 changes: 6 additions & 6 deletions src/pybind11/PyBindImath/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
MACOSX_FRAMEWORK_IDENTIFIER "github.com/AcademySoftwareFoundation/Imath/PyBind"
MACOSX_FRAMEWORK_BUNDLE_VERSION "${PYBINDIMATH_LIB_SUFFIX}"
MACOSX_FRAMEWORK_SHORT_VERSION_STRING "${Imath_VERSION}"
MACOSX_RPATH TRUE)
endif()