Merge pull request #55 from jia1sun/iotg_ipu6

iotg adl-p pv release
intel · May 8, 2023 · 08e237a · 08e237a
2 parents 919f58c + eef30d1
commit 08e237a
Show file tree

Hide file tree

Showing 110 changed files with 2,145 additions and 21,620 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -256,6 +256,13 @@ else()
 endif()
 
 add_library(camhal_static STATIC ${LIBCAMHAL_SRCS})
+
+if (NOT CAL_BUILD AND (NOT "${CMAKE_INSTALL_SUB_PATH}" STREQUAL ""))
+    set(CMAKE_SKIP_RPATH TRUE)
+    set_target_properties(camhal PROPERTIES LINK_FLAGS
+                          "-Wl,-rpath,/usr/lib/${CMAKE_INSTALL_SUB_PATH}")
+    add_compile_definitions(SUB_CONFIG_PATH="${CMAKE_INSTALL_SUB_PATH}")
+endif()
 set_target_properties(camhal_static PROPERTIES OUTPUT_NAME "camhal")
 
 #---------------------------- Link settings ----------------------------
@@ -378,10 +385,12 @@ endif() #ENABLE_SANDBOXING
 #--------------------------- Install settings ---------------------------
 if (NOT CAL_BUILD)
 # Install headers
-install(DIRECTORY include/ DESTINATION include/${CMAKE_INSTALL_SUB_PATH}/libcamhal)
-if (SUPPORT_LIVE_TUNING)
-    install(FILES modules/livetune/LiveTuning.h DESTINATION include/${CMAKE_INSTALL_SUB_PATH}/libcamhal/api)
-endif() #SUPPORT_LIVE_TUNING
+if ("${CMAKE_INSTALL_SUB_PATH}" STREQUAL "")
+    install(DIRECTORY include/ DESTINATION include/libcamhal)
+    if (SUPPORT_LIVE_TUNING)
+        install(FILES modules/livetune/LiveTuning.h DESTINATION include/libcamhal/api)
+    endif() #SUPPORT_LIVE_TUNING
+endif()
 
 # Install configure files
 # By default ipu4 is used

diff --git a/config/linux/ipu6ep/AR0234_TGL_10bits.aiqb b/config/linux/ipu6ep/AR0234_TGL_10bits.aiqb
diff --git a/config/linux/ipu6ep/sensors/imx390.xml b/config/linux/ipu6ep/sensors/imx390.xml
diff --git a/config/linux/ipu6epmtl/0315_imx274_wfov.IPU6.aiqb b/config/linux/ipu6epmtl/0315_imx274_wfov.IPU6.aiqb
diff --git a/config/linux/ipu6epmtl/0524_A_IMX477_WFOV_PSS.IPU6.ipdev.IPU6.aiqb b/config/linux/ipu6epmtl/0524_A_IMX477_WFOV_PSS.IPU6.ipdev.IPU6.aiqb
diff --git a/config/linux/ipu6epmtl/AR0234_BARCODE_TGL.aiqb b/config/linux/ipu6epmtl/AR0234_BARCODE_TGL.aiqb
diff --git a/config/linux/ipu6epmtl/AR0234_TGL_10bits.aiqb b/config/linux/ipu6epmtl/AR0234_TGL_10bits.aiqb
diff --git a/config/linux/ipu6epmtl/IMX135_13P2BAD33_TGL.aiqb b/config/linux/ipu6epmtl/IMX135_13P2BAD33_TGL.aiqb
diff --git a/config/linux/ipu6epmtl/IMX362_A12N08B_MDSVE_TGL.aiqb b/config/linux/ipu6epmtl/IMX362_A12N08B_MDSVE_TGL.aiqb
diff --git a/config/linux/ipu6epmtl/IMX362_A12N08B_MD_TGL.aiqb b/config/linux/ipu6epmtl/IMX362_A12N08B_MD_TGL.aiqb
diff --git a/config/linux/ipu6epmtl/IMX362_A12N08B_SVE_TGL.aiqb b/config/linux/ipu6epmtl/IMX362_A12N08B_SVE_TGL.aiqb
diff --git a/config/linux/ipu6epmtl/IMX362_A12N08B_TGL.aiqb b/config/linux/ipu6epmtl/IMX362_A12N08B_TGL.aiqb
diff --git a/config/linux/ipu6epmtl/IMX390_HDR_TGL.aiqb b/config/linux/ipu6epmtl/IMX390_HDR_TGL.aiqb
diff --git a/config/linux/ipu6epmtl/IMX390_HDR_TGL_2.aiqb b/config/linux/ipu6epmtl/IMX390_HDR_TGL_2.aiqb
diff --git a/config/linux/ipu6epmtl/IMX477_MOD255I_DOL_TGL.aiqb b/config/linux/ipu6epmtl/IMX477_MOD255I_DOL_TGL.aiqb
diff --git a/config/linux/ipu6epmtl/IMX477_MOD26552_BAYER_TGL.aiqb b/config/linux/ipu6epmtl/IMX477_MOD26552_BAYER_TGL.aiqb
diff --git a/config/linux/ipu6epmtl/IMX477_MOD26552_WFOV_TGL.aiqb b/config/linux/ipu6epmtl/IMX477_MOD26552_WFOV_TGL.aiqb
diff --git a/config/linux/ipu6epmtl/IMX488_56B6_TGL.aiqb b/config/linux/ipu6epmtl/IMX488_56B6_TGL.aiqb
diff --git a/config/linux/ipu6epmtl/OV01A1S_YHRN180_TGL.aiqb b/config/linux/ipu6epmtl/OV01A1S_YHRN180_TGL.aiqb
diff --git a/config/linux/ipu6epmtl/OV01A1S_YHRN_TGL.aiqb b/config/linux/ipu6epmtl/OV01A1S_YHRN_TGL.aiqb
diff --git a/config/linux/ipu6epmtl/OV13858_MSHW0261_TGL.aiqb b/config/linux/ipu6epmtl/OV13858_MSHW0261_TGL.aiqb
diff --git a/config/linux/ipu6epmtl/OV5693_13P2BA540_BIN_TGL.aiqb b/config/linux/ipu6epmtl/OV5693_13P2BA540_BIN_TGL.aiqb
diff --git a/config/linux/ipu6epmtl/OV5693_MSHW0220_TGL.aiqb b/config/linux/ipu6epmtl/OV5693_MSHW0220_TGL.aiqb
diff --git a/config/linux/ipu6epmtl/OV5693_MSHW0260_TGL.aiqb b/config/linux/ipu6epmtl/OV5693_MSHW0260_TGL.aiqb
diff --git a/config/linux/ipu6epmtl/OV7251_MSHW0222_TGL.aiqb b/config/linux/ipu6epmtl/OV7251_MSHW0222_TGL.aiqb
diff --git a/config/linux/ipu6epmtl/OV8865_MSHW0221_TGL.aiqb b/config/linux/ipu6epmtl/OV8865_MSHW0221_TGL.aiqb
diff --git a/config/linux/ipu6epmtl/VD55G0_MSHW0262_TGL.aiqb b/config/linux/ipu6epmtl/VD55G0_MSHW0262_TGL.aiqb
diff --git a/config/linux/ipu6epmtl/gcss/graph_descriptor.xml b/config/linux/ipu6epmtl/gcss/graph_descriptor.xml
diff --git a/config/linux/ipu6epmtl/gcss/graph_settings_ar0234.xml b/config/linux/ipu6epmtl/gcss/graph_settings_ar0234.xml
diff --git a/config/linux/ipu6epmtl/gcss/graph_settings_external_source.xml b/config/linux/ipu6epmtl/gcss/graph_settings_external_source.xml