Skip to content

Commit 9730c54

Browse files
committed
adding echos to see which installdeps bash script is running in which ci task
Signed-off-by: grdanny <danny.gr@gmail.com>
1 parent 81c56f4 commit 9730c54

File tree

3 files changed

+37
-0
lines changed

3 files changed

+37
-0
lines changed

src/build-scripts/gh-installdeps.bash

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
set -ex
1010

11+
echo "--ls--"
12+
1113

1214
#
1315
# Install system packages when those are acceptable for dependencies.

src/build-scripts/gh-win-installdeps.bash

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
# SPDX-License-Identifier: Apache-2.0
55
# https://github.com/AcademySoftwareFoundation/OpenImageIO
66

7+
echo "gh-win-installdeps.bash"
8+
79
DEP_DIR="$PWD/dist/$PLATFORM"
810
mkdir -p "$DEP_DIR"
911
mkdir -p ext

src/cmake/build_OpenJPEG.cmake

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# Copyright Contributors to the OpenImageIO project.
2+
# SPDX-License-Identifier: Apache-2.0
3+
# https://github.com/Academ SoftwareFoundation/OpenImageIO
4+
5+
set_cache (OpenJPEG_BUILD_VERSION 2.5.4 "OpenJPEG version for local builds")
6+
set (OpenJPEG_GIT_REPOSITORY "https://github.com/uclouvain/openjpeg.git")
7+
set (OpenJPEG_GIT_TAG "v${OpenJPEG_BUILD_VERSION}")
8+
set_cache (OpenJPEG_BUILD_SHARED_LIBS ${LOCAL_BUILD_SHARED_LIBS_DEFAULT}
9+
DOC "Should a local OpenJPEG build, if necessary, build shared libraries" ADVANCED)
10+
11+
12+
string (MAKE_C_IDENTIFIER ${OpenJPEG_BUILD_VERSION} OpenJPEG_VERSION_IDENT)
13+
14+
build_dependency_with_cmake(OpenJPEG
15+
VERSION ${OpenJPEG_BUILD_VERSION}
16+
GIT_REPOSITORY ${OpenJPEG_GIT_REPOSITORY}
17+
GIT_TAG ${OpenJPEG_GIT_TAG}
18+
CMAKE_ARGS
19+
-D BUILD_CODEC=OFF
20+
21+
22+
)
23+
# Set some things up that we'll need for a subsequent find_package to work
24+
set (OpenJPEG_ROOT ${OpenJPEG_LOCAL_INSTALL_DIR})
25+
26+
27+
# Signal to caller that we need to find again at the installed location
28+
set (OpenJPEG_REFIND TRUE)
29+
set (OpenJPEG_REFIND_ARGS CONFIG)
30+
31+
if (OpenJPEG_BUILD_SHARED_LIBS)
32+
install_local_dependency_libs (OpenJPEG OpenJPEG)
33+
endif ()

0 commit comments

Comments
 (0)