Merge pull request #118 from hao-yao/dfsg

Fix libraries suffix for IPU6
intel · Aug 9, 2024 · 64cee48 · drhooray · Aug 9, 2024 · 64cee48
2 parents bb5d97c + d7223b6
commit 64cee48
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/build.sh b/build.sh
@@ -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 ..
 }
@@ -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
 }
 

diff --git a/cmake/FindLIBGCSS.cmake b/cmake/FindLIBGCSS.cmake
@@ -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()

diff --git a/cmake/FindLIBIACSS.cmake b/cmake/FindLIBIACSS.cmake
@@ -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()