Skip to content

Commit b465f8c

Browse files
committed
apple.16
Signed-off-by: Cary Phillips <cary@ilm.com>
1 parent 7730692 commit b465f8c

2 files changed

Lines changed: 10 additions & 4 deletions

File tree

.github/workflows/ci_steps.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@ jobs:
6969
- name: Checkout Repository
7070
uses: actions/checkout@v3
7171

72+
- name: Install tree
73+
run: |
74+
brew install tree
75+
shell: bash
76+
7277
- name: Set Up Directories & Environment
7378
run: |
7479
set -x
@@ -613,6 +618,7 @@ jobs:
613618
# Confirm the website examples compile on iOS
614619
run: |
615620
set -x
621+
tree $INSTALL_DIR/Imath.framework
616622
EXAMPLES_BUILD_DIR=$WORKSPACE/_build.examples.iOS
617623
cmake_args=("-B" "$EXAMPLES_BUILD_DIR" "-S" "$WORKSPACE/website/examples")
618624
cmake_args+=("-DCMAKE_PREFIX_PATH=$INSTALL_DIR/Imath.framework")
@@ -624,5 +630,5 @@ jobs:
624630
quoted_args=$(printf '%q ' "${cmake_args[@]}")
625631
$CMAKE $quoted_args
626632
$CMAKE --build $EXAMPLES_BUILD_DIR --config ${{ inputs.build-type }}
627-
find $EXAMPLES_BUILD_DIR
633+
tree $EXAMPLES_BUILD_DIR
628634
shell: bash

src/Imath/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,10 @@ if (IMATH_INSTALL)
160160
install(CODE "
161161
execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
162162
Versions/Current/Resources
163-
\${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}.framework/Resources)
163+
\${CMAKE_INSTALL_PREFIX}/\${PROJECT_NAME}.framework/Resources)
164164
execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
165-
"${Imath_VERSION_MAJOR}.${Imath_VERSION_MINOR}"
166-
\${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}.framework/Versions/Current)
165+
\${Imath_VERSION_MAJOR}.\${Imath_VERSION_MINOR}
166+
\${CMAKE_INSTALL_PREFIX}/\${PROJECT_NAME}.framework/Versions/Current)
167167
")
168168
else()
169169
message(STATUS "NOT Creating Resources symlink")

0 commit comments

Comments
 (0)