Skip to content

Commit e23e8f1

Browse files
cary-ilmcary-ilm
committed
Improve Apple framework support
- Properly handle the differences between macOS and iOS framework typical structure. macOS places Headers and Resource in Versions and symlinks to them; iOS does not use a Versions folder - Add CI builds for both of macOS and iOS, and uses Universal2 for the macOS build, i.e. CMAKE_OSX_ARCHITECTURES="x86_64;arm64" - .md files are not included as Resources - Rename 'IMATH_BUILD_APPLE_FRAMEWORKS' to 'IMATH_BUILD_APPLE_FRAMWORK' (with the 'S') Signed-off-by: Cary Phillips <cary@ilm.com>
1 parent d657c77 commit e23e8f1

29 files changed

Lines changed: 552 additions & 344 deletions

‎.github/workflows/ci_steps.yml‎

Lines changed: 44 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,13 @@ on:
4545
type: string
4646
BUILD_TESTING:
4747
type: string
48-
IMATH_BUILD_APPLE_FRAMEWORKS:
48+
IMATH_BUILD_APPLE_FRAMEWORK:
49+
type: string
50+
CMAKE_OSX_SYSROOT:
51+
type: string
52+
CMAKE_OSX_ARCHITECTURES:
53+
type: string
54+
CMAKE_SYSTEM_NAME:
4955
type: string
5056
IMATH_TEST_PYTHON:
5157
type: string
@@ -252,7 +258,7 @@ jobs:
252258
cmake_args+=("-DBUILD_SHARED_LIBS=${{ inputs.BUILD_SHARED_LIBS }}")
253259
cmake_args+=("-DIMATH_INSTALL_PKG_CONFIG=${{ inputs.IMATH_INSTALL_PKG_CONFIG }}")
254260
cmake_args+=("-DIMATH_INSTALL_SYM_LINK=${{ inputs.IMATH_INSTALL_SYM_LINK }}")
255-
cmake_args+=("-DIMATH_BUILD_APPLE_FRAMEWORKS=${{ inputs.IMATH_BUILD_APPLE_FRAMEWORKS }}")
261+
cmake_args+=("-DIMATH_BUILD_APPLE_FRAMEWORK=${{ inputs.IMATH_BUILD_APPLE_FRAMEWORK }}")
256262
cmake_args+=("-DBUILD_TESTING=${{ inputs.BUILD_TESTING }}")
257263
cmake_args+=("-DPYTHON=${{ inputs.python }}")
258264
cmake_args+=("-DPYBIND11=${{ inputs.pybind11 }}")
@@ -289,8 +295,14 @@ jobs:
289295
cmake_args+=("-DPYIMATH_LIB_SUFFIX=PY_${{ inputs.namespace }}")
290296
cmake_args+=("-DPYBINDIMATH_LIB_SUFFIX=PYBIND_${{ inputs.namespace }}")
291297
fi
292-
if [ "${{ inputs.IMATH_BUILD_APPLE_FRAMEWORKS }}" == "ON" ]; then
293-
cmake_args+=("-DCMAKE_SYSTEM_NAME=iOS")
298+
if [ -n "${{ inputs.CMAKE_SYSTEM_NAME }}" ]; then
299+
cmake_args+=("-DCMAKE_SYSTEM_NAME=${{ inputs.CMAKE_SYSTEM_NAME }}")
300+
fi
301+
if [ -n "${{ inputs.CMAKE_OSX_SYSROOT }}" ]; then
302+
cmake_args+=("-DCMAKE_OSX_SYSROOT=${{ inputs.CMAKE_OSX_SYSROOT }}")
303+
fi
304+
if [ -n "${{ inputs.CMAKE_OSX_ARCHITECTURES }}" ]; then
305+
cmake_args+=("-DCMAKE_OSX_ARCHITECTURES=${{ inputs.CMAKE_OSX_ARCHITECTURES }}")
294306
fi
295307
296308
quoted_args=$(printf '%q ' "${cmake_args[@]}")
@@ -308,6 +320,7 @@ jobs:
308320
run: |
309321
set -x
310322
$CMAKE --version
323+
echo $CMAKE ${{ env.CMAKE_ARGS }}
311324
$CMAKE ${{ env.CMAKE_ARGS }}
312325
$CMAKE --build $BUILD_DIR --target install --config ${{ inputs.build-type }}
313326
shell: bash
@@ -323,7 +336,7 @@ jobs:
323336
shell: msys2 {0}
324337

325338
- name: Validate library symlinks
326-
if: inputs.BUILD_SHARED_LIBS == 'ON' && inputs.IMATH_BUILD_APPLE_FRAMEWORKS != 'ON' && inputs.IMATH_INSTALL_SYM_LINK == 'ON'
339+
if: inputs.BUILD_SHARED_LIBS == 'ON' && inputs.IMATH_BUILD_APPLE_FRAMEWORK != 'ON' && inputs.IMATH_INSTALL_SYM_LINK == 'ON'
327340
# Validate that the proper symlinks have been created
328341
# between the various versions of the .so/.dylib/.dll,
329342
# especially the one created explicitly (based on the
@@ -470,7 +483,7 @@ jobs:
470483
shell: bash
471484

472485
- name: Test ImathTest Standalone
473-
if: inputs.msystem == '' && inputs.IMATH_BUILD_APPLE_FRAMEWORKS != 'ON'
486+
if: inputs.msystem == '' && inputs.IMATH_BUILD_APPLE_FRAMEWORK != 'ON'
474487
# Use the ImathTest program as an example of an application
475488
# using the Imath library, to validate that we can build
476489
# against the just-installed Imath library
@@ -510,33 +523,8 @@ jobs:
510523
fi
511524
shell: bash
512525

513-
- name: Test ImathTest Standalone (iOS)
514-
if: inputs.msystem == '' && inputs.IMATH_BUILD_APPLE_FRAMEWORKS == 'ON'
515-
# Use the ImathTest program as an example of an application
516-
# using the Imath library, to validate that we can build
517-
# against the just-installed Imath library
518-
run: |
519-
set -x
520-
521-
IMATHTEST_BUILD_DIR=$WORKSPACE/_build.imathTest.iOS
522-
cmake_args=("-B" "$IMATHTEST_BUILD_DIR" "-S" "$WORKSPACE/src/ImathTest")
523-
cmake_args+=("-DImath_DIR=$INSTALL_DIR/lib/Imath.framework/Resources")
524-
cmake_args+=("-DCMAKE_BUILD_TYPE=${{ inputs.build-type }}")
525-
cmake_args+=("-DCMAKE_CXX_STANDARD=${{ inputs.cxx-standard }}")
526-
cmake_args+=("-DCMAKE_CXX_FLAGS=${{ inputs.cxx-flags }}")
527-
cmake_args+=("-DCMAKE_VERBOSE_MAKEFILE=ON")
528-
cmake_args+=("-DCMAKE_SYSTEM_NAME=iOS")
529-
cmake_args+=("-DCMAKE_OSX_SYSROOT=iphoneos")
530-
cmake_args+=("-DCMAKE_OSX_ARCHITECTURES=arm64")
531-
quoted_args=$(printf '%q ' "${cmake_args[@]}")
532-
$CMAKE $quoted_args
533-
$CMAKE --build $IMATHTEST_BUILD_DIR \
534-
--config ${{ inputs.build-type }}
535-
otool -L $IMATHTEST_BUILD_DIR/bin/ImathTest.app/ImathTest
536-
shell: bash
537-
538526
- name: Test PyImathTest Standalone
539-
if: inputs.msystem == '' && inputs.PYTHON == 'ON' && inputs.IMATH_TEST_PYTHON == 'ON' && inputs.IMATH_BUILD_APPLE_FRAMEWORKS != 'ON'
527+
if: inputs.msystem == '' && inputs.PYTHON == 'ON' && inputs.IMATH_TEST_PYTHON == 'ON' && inputs.IMATH_BUILD_APPLE_FRAMEWORK != 'ON'
540528
# Use the PyImathTestC program as an example of an application
541529
# that uses the PyImath library, to validate that we can build
542530
# against the just-installed Imath library (with python
@@ -573,7 +561,7 @@ jobs:
573561
shell: bash
574562

575563
- name: Examples
576-
if: inputs.namespace == '' && inputs.msystem == '' && inputs.IMATH_BUILD_APPLE_FRAMEWORKS != 'ON'
564+
if: inputs.namespace == '' && inputs.msystem == '' && inputs.IMATH_BUILD_APPLE_FRAMEWORK != 'ON'
577565
# Confirm the website examples compile and execute.
578566
# The example code uses the Imath:: namespace explicitly, so
579567
# they won't work with a custom namespace, so skip the test in
@@ -633,4 +621,26 @@ jobs:
633621
$EXAMPLES_BUILD_DIR/bin/imath-examples.exe
634622
shell: msys2 {0}
635623

636-
624+
- name: Examples (Apple Framework)
625+
if: inputs.namespace == '' && inputs.msystem == '' && inputs.IMATH_BUILD_APPLE_FRAMEWORK == 'ON'
626+
# Confirm the website examples compile against an Apple framework installation
627+
run: |
628+
set -x
629+
EXAMPLES_BUILD_DIR=$WORKSPACE/_build.examples.apple
630+
IMATH_DIR=$(find $INSTALL_DIR -type d -path "*/Imath.framework/*/Resources/CMake/Imath" | head -n 1)
631+
cmake_args=("-B" "$EXAMPLES_BUILD_DIR" "-S" "$WORKSPACE/website/examples")
632+
cmake_args+=("-DImath_DIR=$IMATH_DIR")
633+
cmake_args+=("-DCMAKE_BUILD_TYPE=${{ inputs.build-type }}")
634+
cmake_args+=("-DCMAKE_CXX_STANDARD=${{ inputs.cxx-standard }}")
635+
if [ -n "${{ inputs.CMAKE_SYSTEM_NAME }}" ]; then
636+
cmake_args+=("-DCMAKE_SYSTEM_NAME=${{ inputs.CMAKE_SYSTEM_NAME }}")
637+
fi
638+
if [ -n "${{ inputs.CMAKE_OSX_SYSROOT }}" ]; then
639+
cmake_args+=("-DCMAKE_OSX_SYSROOT=${{ inputs.CMAKE_OSX_SYSROOT }}")
640+
fi
641+
if [ -n "${{ inputs.CMAKE_OSX_ARCHITECTURES }}" ]; then
642+
cmake_args+=("-DCMAKE_OSX_ARCHITECTURES=${{ inputs.CMAKE_OSX_ARCHITECTURES }}")
643+
fi
644+
$CMAKE "${cmake_args[@]}"
645+
$CMAKE --build $EXAMPLES_BUILD_DIR --config ${{ inputs.build-type }}
646+
shell: bash

‎.github/workflows/ci_workflow.yml‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,17 @@ jobs:
104104
# values.
105105
os: ${{ matrix.os || 'macos-14' }}
106106
build: ${{ matrix.build }}
107+
cmake: ${{ matrix.cmake || '3.15.7' }}
107108
cxx-standard: ${{ matrix.cxx-standard || '14' }}
108109
build-type: ${{ matrix.build-type || 'Release' }}
109110
python: ${{ matrix.python || 'ON' }}
110111
pybind11: ${{ matrix.pybind11 || 'ON' }}
111112
BUILD_SHARED_LIBS: ${{ matrix.BUILD_SHARED_LIBS || 'ON' }}
112113
IMATH_INSTALL_PKG_CONFIG: ${{ matrix.IMATH_INSTALL_PKG_CONFIG || 'ON' }}
113114
IMATH_INSTALL_SYM_LINK: ${{ matrix.IMATH_INSTALL_SYM_LINK || 'ON' }}
114-
IMATH_BUILD_APPLE_FRAMEWORKS: ${{ matrix.IMATH_BUILD_APPLE_FRAMEWORKS || 'OFF' }}
115+
IMATH_BUILD_APPLE_FRAMEWORK: ${{ matrix.IMATH_BUILD_APPLE_FRAMEWORK || 'OFF' }}
116+
CMAKE_SYSTEM_NAME: ${{ matrix.CMAKE_SYSTEM_NAME }}
117+
CMAKE_OSX_ARCHITECTURES: ${{ matrix.CMAKE_OSX_ARCHITECTURES }}
115118
BUILD_TESTING: ${{ matrix.BUILD_TESTING || 'ON' }}
116119
IMATH_TEST_PYTHON: ${{ matrix.IMATH_TEST_PYTHON || 'ON' }}
117120
IMATH_TEST_PYBIND11: ${{ matrix.IMATH_TEST_PYBIND11 || 'ON' }}
@@ -145,11 +148,20 @@ jobs:
145148
os: macos-13
146149

147150
- build: 6
148-
label: Apple Frameworks
149-
IMATH_BUILD_APPLE_FRAMEWORKS: 'ON'
151+
label: Apple Framework Universal2
152+
IMATH_BUILD_APPLE_FRAMEWORK: 'ON'
153+
CMAKE_OSX_ARCHITECTURES: "x86_64;arm64"
154+
BUILD_TESTING: 'OFF'
155+
python: 'OFF'
156+
pybind11: 'OFF'
157+
158+
- build: 7
159+
label: Apple iOS
160+
IMATH_BUILD_APPLE_FRAMEWORK: 'ON'
161+
CMAKE_SYSTEM_NAME: iOS
150162
BUILD_TESTING: 'OFF'
151-
python: 'OFF' # conan boost doesn't support iOS
152-
pybind11: 'OFF' # iOS doesn't support CPython
163+
python: 'OFF'
164+
pybind11: 'OFF'
153165

154166
windows:
155167
name: 'Windows.${{ matrix.build}}: ${{ matrix.label }}'

‎CMakeLists.txt‎

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -43,31 +43,22 @@ message(STATUS "Configure ${IMATH_PACKAGE_NAME}, library API version: ${IMATH_LI
4343
option(IMATH_INSTALL "Install Imath library" ON)
4444

4545
if (APPLE)
46-
option(IMATH_BUILD_APPLE_FRAMEWORKS "Build as Apple Frameworks" OFF)
46+
option(IMATH_BUILD_APPLE_FRAMEWORK "Build as Apple Framework" OFF)
4747
endif()
4848

4949
# Config headers and package config files
5050
add_subdirectory(config)
5151

52-
if (IMATH_BUILD_APPLE_FRAMEWORKS)
53-
# Define resource files for Apple Framework
54-
set(IMATH_RESOURCE_FILES
55-
"${CMAKE_SOURCE_DIR}/README.md"
56-
"${CMAKE_SOURCE_DIR}/LICENSE.md"
57-
"${CMAKE_SOURCE_DIR}/SECURITY.md"
58-
"${CMAKE_CURRENT_BINARY_DIR}/config/ImathTargets.cmake"
59-
"${CMAKE_CURRENT_BINARY_DIR}/config/ImathConfig.cmake"
60-
"${CMAKE_CURRENT_BINARY_DIR}/config/ImathConfigVersion.cmake"
61-
)
62-
if (PYTHON)
63-
set(IMATH_RESOURCE_FILES ${IMATH_RESOURCE_FILES} "${CMAKE_CURRENT_BINARY_DIR}/config/PyImathTargets.cmake")
64-
endif()
65-
if (PYBIND11)
66-
set(IMATH_RESOURCE_FILES ${IMATH_RESOURCE_FILES} "${CMAKE_CURRENT_BINARY_DIR}/config/PyBindImathTargets.cmake")
67-
endif()
68-
69-
message(STATUS "Resource files: ${IMATH_RESOURCE_FILES}")
70-
endif()
52+
#if (IMATH_BUILD_APPLE_FRAMEWORK)
53+
# if (PYTHON)
54+
# set(IMATH_RESOURCE_FILES ${IMATH_RESOURCE_FILES} "${CMAKE_CURRENT_BINARY_DIR}/config/PyImathTargets.cmake")
55+
# endif()
56+
# if (PYBIND11)
57+
# set(IMATH_RESOURCE_FILES ${IMATH_RESOURCE_FILES} "${CMAKE_CURRENT_BINARY_DIR}/config/PyBindImathTargets.cmake")
58+
# endif()
59+
#
60+
# message(STATUS "Resource files: ${IMATH_RESOURCE_FILES}")
61+
#endif()
7162

7263
# uninstall target
7364
if(NOT TARGET uninstall)
@@ -102,8 +93,8 @@ if (BUILD_WEBSITE AND NOT IMATH_IS_SUBPROJECT)
10293
add_subdirectory(website)
10394
endif()
10495

105-
# pkg-config is not required for Apple Frameworks
106-
if (IMATH_BUILD_APPLE_FRAMEWORKS)
96+
# pkg-config is not required for Apple Framework
97+
if (IMATH_BUILD_APPLE_FRAMEWORK)
10798
set(IMATH_INSTALL_SYM_LINK OFF)
10899
endif()
109100

‎config/CMakeLists.txt‎

Lines changed: 37 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,26 @@ set(IMATH_CONFIG_DIR "${CMAKE_CURRENT_BINARY_DIR}" CACHE INTERNAL "")
1616
add_library(ImathConfig INTERFACE)
1717
add_library(Imath::Config ALIAS ImathConfig)
1818

19-
target_include_directories(ImathConfig INTERFACE
20-
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
21-
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
22-
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${IMATH_OUTPUT_SUBDIR}>)
19+
if (IMATH_BUILD_APPLE_FRAMEWORK)
20+
# apple framework installs includes in Imath.framework/Headers, not include/Imath
21+
target_include_directories(ImathConfig INTERFACE
22+
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
23+
$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/Imath.framework/Headers>
24+
)
25+
else()
26+
target_include_directories(ImathConfig INTERFACE
27+
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
28+
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${IMATH_OUTPUT_SUBDIR}>
29+
)
30+
endif()
2331

2432
if (IMATH_INSTALL)
25-
if (NOT IMATH_BUILD_APPLE_FRAMEWORKS)
26-
install(
27-
FILES ${CMAKE_CURRENT_BINARY_DIR}/ImathConfig.h
28-
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${IMATH_OUTPUT_SUBDIR}
29-
)
30-
endif()
3133
install(TARGETS ImathConfig EXPORT Imath)
3234
endif()
3335

3436
add_library(Imath::Config ALIAS ImathConfig)
3537

36-
if(IMATH_INSTALL_PKG_CONFIG AND NOT IMATH_BUILD_APPLE_FRAMEWORKS)
38+
if(IMATH_INSTALL_PKG_CONFIG AND NOT IMATH_BUILD_APPLE_FRAMEWORK)
3739

3840
# Prepend prefix for includedir only if CMAKE_INSTALL_INCLUDEDIR is relative
3941
if(IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}")
@@ -72,34 +74,37 @@ endif()
7274

7375
include(CMakePackageConfigHelpers)
7476

77+
set(IMATH_CMAKE_CONFIG_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}
78+
CACHE INTERNAL "dir for .cmake files")
79+
file(MAKE_DIRECTORY ${IMATH_CMAKE_CONFIG_BUILD_DIR})
80+
81+
if(APPLE AND IMATH_BUILD_APPLE_FRAMEWORK)
82+
# macOS framework versions the Resources and headers, iOS does not
83+
if(CMAKE_SYSTEM_NAME STREQUAL "iOS")
84+
set(cmake_destination Imath.framework/Resources/CMake/Imath)
85+
else()
86+
set(cmake_destination Imath.framework/Versions/${Imath_VERSION_MAJOR}.${Imath_VERSION_MINOR}/Resources/CMake/Imath)
87+
endif()
88+
else()
89+
set(cmake_destination ${CMAKE_INSTALL_LIBDIR}/cmake/Imath)
90+
endif()
91+
7592
configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/ImathConfig.cmake.in
76-
${CMAKE_CURRENT_BINARY_DIR}/ImathConfig.cmake
77-
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Imath
93+
${IMATH_CMAKE_CONFIG_BUILD_DIR}/ImathConfig.cmake
94+
INSTALL_DESTINATION ${cmake_destination}
7895
)
7996

80-
write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/ImathConfigVersion.cmake"
81-
VERSION ${IMATH_VERSION}
97+
write_basic_package_version_file(${IMATH_CMAKE_CONFIG_BUILD_DIR}/ImathConfigVersion.cmake
98+
VERSION ${PROJECT_VERSION}
8299
COMPATIBILITY SameMajorVersion
83100
)
84101

85102
if (IMATH_INSTALL)
86-
if (NOT IMATH_BUILD_APPLE_FRAMEWORKS)
87-
install(
88-
FILES ${CMAKE_CURRENT_BINARY_DIR}/ImathConfig.cmake
89-
${CMAKE_CURRENT_BINARY_DIR}/ImathConfigVersion.cmake
90-
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Imath
91-
)
92103

93-
install(EXPORT Imath
94-
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Imath
95-
FILE ImathTargets.cmake
96-
NAMESPACE Imath::
97-
EXPORT_LINK_INTERFACE_LIBRARIES
98-
)
99-
endif()
100-
101-
export(EXPORT Imath
102-
FILE "${CMAKE_CURRENT_BINARY_DIR}/ImathTargets.cmake"
103-
NAMESPACE Imath::
104+
install(FILES
105+
${IMATH_CMAKE_CONFIG_BUILD_DIR}/ImathConfig.cmake
106+
${IMATH_CMAKE_CONFIG_BUILD_DIR}/ImathConfigVersion.cmake
107+
DESTINATION ${cmake_destination}
104108
)
109+
105110
endif()

‎share/ci/install_manifest/install_manifest.linux.1.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: BSD-3-Clause
22
# Copyright (c) Contributors to the OpenEXR Project.
3-
# cmake -B /home/runner/work/Imath/Imath/_build -S /home/runner/work/Imath/Imath -DCMAKE_INSTALL_PREFIX=/home/runner/work/Imath/Imath/_install -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=17 -DBUILD_SHARED_LIBS=ON -DIMATH_INSTALL_PKG_CONFIG=ON -DIMATH_BUILD_APPLE_FRAMEWORKS= -DBUILD_TESTING=ON -DPYTHON=ON -DPYBIND11=ON -DCMAKE_VERBOSE_MAKEFILE=ON -DPython3_EXECUTABLE=/usr/bin/python -DPYTHON_INSTALL_DIR=/home/runner/work/Imath/Imath/_install/python -DNumpy_INCLUDE_DIR=/home/runner/.local/lib/python3.12/site-packages/numpy/core/include -DIMATH_TEST_PYTHON= -DIMATH_TEST_PYBIND11= -Dpybind11_DIR=/home/runner/.local/lib/python3.12/site-packages/pybind11/share/cmake/pybind11 -DBoost_ROOT=/home/runner/work/Imath/Imath/_conan -DCMAKE_TOOLCHAIN_FILE=/home/runner/work/Imath/Imath/_conan/conan_toolchain.cmake
3+
# cmake -B /home/runner/work/Imath/Imath/_build -S /home/runner/work/Imath/Imath -DCMAKE_INSTALL_PREFIX=/home/runner/work/Imath/Imath/_install -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=17 -DBUILD_SHARED_LIBS=ON -DIMATH_INSTALL_PKG_CONFIG=ON -DIMATH_BUILD_APPLE_FRAMEWORK= -DBUILD_TESTING=ON -DPYTHON=ON -DPYBIND11=ON -DCMAKE_VERBOSE_MAKEFILE=ON -DPython3_EXECUTABLE=/usr/bin/python -DPYTHON_INSTALL_DIR=/home/runner/work/Imath/Imath/_install/python -DNumpy_INCLUDE_DIR=/home/runner/.local/lib/python3.12/site-packages/numpy/core/include -DIMATH_TEST_PYTHON= -DIMATH_TEST_PYBIND11= -Dpybind11_DIR=/home/runner/.local/lib/python3.12/site-packages/pybind11/share/cmake/pybind11 -DBoost_ROOT=/home/runner/work/Imath/Imath/_conan -DCMAKE_TOOLCHAIN_FILE=/home/runner/work/Imath/Imath/_conan/conan_toolchain.cmake
44
include/Imath/ImathBox.h
55
include/Imath/ImathBoxAlgo.h
66
include/Imath/ImathColor.h

‎share/ci/install_manifest/install_manifest.linux.2.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: BSD-3-Clause
22
# Copyright (c) Contributors to the OpenEXR Project.
3-
# cmake -B /home/runner/work/Imath/Imath/_build -S /home/runner/work/Imath/Imath -DCMAKE_INSTALL_PREFIX=/home/runner/work/Imath/Imath/_install -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_STANDARD=17 -DBUILD_SHARED_LIBS=ON -DIMATH_INSTALL_PKG_CONFIG=ON -DIMATH_BUILD_APPLE_FRAMEWORKS= -DBUILD_TESTING=ON -DPYTHON=ON -DPYBIND11=ON -DCMAKE_VERBOSE_MAKEFILE=ON -DPython3_EXECUTABLE=/usr/bin/python -DPYTHON_INSTALL_DIR=/home/runner/work/Imath/Imath/_install/python -DNumpy_INCLUDE_DIR=/home/runner/.local/lib/python3.12/site-packages/numpy/core/include -DIMATH_TEST_PYTHON= -DIMATH_TEST_PYBIND11= -Dpybind11_DIR=/home/runner/.local/lib/python3.12/site-packages/pybind11/share/cmake/pybind11 -DBoost_ROOT=/home/runner/work/Imath/Imath/_conan -DCMAKE_TOOLCHAIN_FILE=/home/runner/work/Imath/Imath/_conan/conan_toolchain.cmake
3+
# cmake -B /home/runner/work/Imath/Imath/_build -S /home/runner/work/Imath/Imath -DCMAKE_INSTALL_PREFIX=/home/runner/work/Imath/Imath/_install -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_STANDARD=17 -DBUILD_SHARED_LIBS=ON -DIMATH_INSTALL_PKG_CONFIG=ON -DIMATH_BUILD_APPLE_FRAMEWORK= -DBUILD_TESTING=ON -DPYTHON=ON -DPYBIND11=ON -DCMAKE_VERBOSE_MAKEFILE=ON -DPython3_EXECUTABLE=/usr/bin/python -DPYTHON_INSTALL_DIR=/home/runner/work/Imath/Imath/_install/python -DNumpy_INCLUDE_DIR=/home/runner/.local/lib/python3.12/site-packages/numpy/core/include -DIMATH_TEST_PYTHON= -DIMATH_TEST_PYBIND11= -Dpybind11_DIR=/home/runner/.local/lib/python3.12/site-packages/pybind11/share/cmake/pybind11 -DBoost_ROOT=/home/runner/work/Imath/Imath/_conan -DCMAKE_TOOLCHAIN_FILE=/home/runner/work/Imath/Imath/_conan/conan_toolchain.cmake
44
include/Imath/ImathBox.h
55
include/Imath/ImathBoxAlgo.h
66
include/Imath/ImathColor.h

‎share/ci/install_manifest/install_manifest.linux.3.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: BSD-3-Clause
22
# Copyright (c) Contributors to the OpenEXR Project.
3-
# cmake -B /home/runner/work/Imath/Imath/_build -S /home/runner/work/Imath/Imath -DCMAKE_INSTALL_PREFIX=/home/runner/work/Imath/Imath/_install -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=17 -DBUILD_SHARED_LIBS=OFF -DIMATH_INSTALL_PKG_CONFIG=ON -DIMATH_BUILD_APPLE_FRAMEWORKS= -DBUILD_TESTING=ON -DPYTHON=ON -DPYBIND11=ON -DCMAKE_VERBOSE_MAKEFILE=ON -DPython3_EXECUTABLE=/usr/bin/python -DPYTHON_INSTALL_DIR=/home/runner/work/Imath/Imath/_install/python -DNumpy_INCLUDE_DIR=/home/runner/.local/lib/python3.12/site-packages/numpy/core/include -DIMATH_TEST_PYTHON= -DIMATH_TEST_PYBIND11= -Dpybind11_DIR=/home/runner/.local/lib/python3.12/site-packages/pybind11/share/cmake/pybind11 -DBoost_ROOT=/home/runner/work/Imath/Imath/_conan -DCMAKE_TOOLCHAIN_FILE=/home/runner/work/Imath/Imath/_conan/conan_toolchain.cmake
3+
# cmake -B /home/runner/work/Imath/Imath/_build -S /home/runner/work/Imath/Imath -DCMAKE_INSTALL_PREFIX=/home/runner/work/Imath/Imath/_install -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=17 -DBUILD_SHARED_LIBS=OFF -DIMATH_INSTALL_PKG_CONFIG=ON -DIMATH_BUILD_APPLE_FRAMEWORK= -DBUILD_TESTING=ON -DPYTHON=ON -DPYBIND11=ON -DCMAKE_VERBOSE_MAKEFILE=ON -DPython3_EXECUTABLE=/usr/bin/python -DPYTHON_INSTALL_DIR=/home/runner/work/Imath/Imath/_install/python -DNumpy_INCLUDE_DIR=/home/runner/.local/lib/python3.12/site-packages/numpy/core/include -DIMATH_TEST_PYTHON= -DIMATH_TEST_PYBIND11= -Dpybind11_DIR=/home/runner/.local/lib/python3.12/site-packages/pybind11/share/cmake/pybind11 -DBoost_ROOT=/home/runner/work/Imath/Imath/_conan -DCMAKE_TOOLCHAIN_FILE=/home/runner/work/Imath/Imath/_conan/conan_toolchain.cmake
44
include/Imath/ImathBox.h
55
include/Imath/ImathBoxAlgo.h
66
include/Imath/ImathColor.h

0 commit comments

Comments
 (0)