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

Fix libraries suffix for IPU6 #118

Merged
merged 2 commits into from
Aug 9, 2024
Merged

Fix libraries suffix for IPU6 #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c45ddce
Add suffix when finding libgcss & libiacss for IPU6
hao-yao Aug 9, 2024
d7223b6
Fix install prefix and use DESTDIR when install to temp dir
hao-yao Aug 9, 2024
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
8 changes: 4 additions & 4 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,15 @@ function build_target() {
-DIPU_VER=$IPU_VERSION \
-DBUILD_CAMHAL_TESTS=OFF \
-DUSE_PG_LITE_PIPE=ON \
-DCMAKE_INSTALL_PREFIX=$INSTALL_DIR/install \
-DCMAKE_INSTALL_PREFIX=/usr \
-DUSE_HAL_ADAPTOR=ON \
..

# make and install
make -j`nproc`
check_result $? "$FUNCNAME: $target"

make install
make DESTDIR=${INSTALL_DIR}/install install
check_result $? "$FUNCNAME: $target"
cd ..
}
Expand All @@ -111,13 +111,13 @@ function build_hal_adaptor() {
cd $SOURCE_DIR/ipu6-camera-hal/src/hal/hal_adaptor
rm -fr build && mkdir -p build && cd build

command cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR/install ../
command cmake -DCMAKE_INSTALL_PREFIX=/usr ../

# make and install
make -j
check_result $? $FUNCNAME

make install
make make DESTDIR=${INSTALL_DIR}/install install
check_result $? $FUNCNAME
}

Expand Down
2 changes: 0 additions & 2 deletions cmake/FindLIBGCSS.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ include(FindPackageHandleStandardArgs)

if(NOT DEFINED IPU_VER)
set(LIBGCSS_PKG_SUFFIX "-ipu4")
elseif(${IPU_VER} STREQUAL ipu6)
set(LIBGCSS_PKG_SUFFIX "")
else()
set(LIBGCSS_PKG_SUFFIX "-${IPU_VER}")
endif()
Expand Down
2 changes: 0 additions & 2 deletions cmake/FindLIBIACSS.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ include(FindPackageHandleStandardArgs)

if(NOT DEFINED IPU_VER)
set(IACSS_PKG_SUFFIX "-ipu4")
elseif(${IPU_VER} STREQUAL ipu6)
set(IACSS_PKG_SUFFIX "")
else()
set(IACSS_PKG_SUFFIX "-${IPU_VER}")
endif()
Expand Down