Skip to content

Commit 049c0cf

Browse files
onceforallonceforall
authored
Merge pull request #146 from onceforall/ia_ipu6
25ww03 release
2 parents dfd4998 + 1f22529 commit 049c0cf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1869
-1251
lines changed

‎CMakeLists.txt

+41-108
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,6 @@ set(ALGOWRAPPER_DIR ${MODULES_DIR}/algowrapper)
4242
set(SANDBOXING_DIR ${MODULES_DIR}/sandboxing)
4343
set(IMAGE_PROCESS_DIR ${SRC_ROOT_DIR}/image_process)
4444

45-
#AAL directories
46-
if (CAL_BUILD)
47-
set(AAL_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/aal)
48-
set(JPEG_DIR ${SRC_ROOT_DIR}/jpeg)
49-
set(MEMORY_DIR ${MODULES_DIR}/memory)
50-
endif() #CAL_BUILD
51-
5245
if (SUPPORT_LIVE_TUNING)
5346
#LiveTuning directories
5447
set(LIVE_TUNING_DIR ${MODULES_DIR}/livetune)
@@ -192,69 +185,16 @@ if(ENABLE_SANDBOXING)
192185
set(LIBCAMHAL_LINK_LIBS ${LIBCAMHAL_LINK_LIBS} ${LIBCAB_LIBS} ${LIBMOJO_LIBS} ${LIBCAMERA_IPC_LIBS} ${CMAKE_PREFIX_PATH}/librt.a)
193186
endif() #ENABLE_SANDBOXING
194187

195-
if (CAL_BUILD)
196-
message("Chrome enabled ")
197-
add_definitions(-DCAL_BUILD -DDUMP_IMAGE)
198-
if (SW_JPEG_ENCODE)
199-
add_definitions(-DSW_JPEG_ENCODE)
200-
include_directories(src/jpeg/sw)
201-
else ()
202-
include_directories(src/jpeg/chrome)
203-
endif()
204-
205-
if (SW_POST_PROCESSING)
206-
include_directories(src/image_process/sw)
207-
else ()
208-
include_directories(src/image_process/chrome)
209-
endif()
210-
211-
add_subdirectory(aal)
212-
213-
set(LIBCAMHAL_SRCS ${LIBCAMHAL_SRCS} ${MEMORY_SRCS} ${AAL_SRCS} ${JPEG_SRCS})
214-
include_directories(include include/api include/utils include/linux
215-
${USR_INCLUDE_HEADER}/android/system/core/include/
216-
${USR_INCLUDE_HEADER}/ia_imaging
217-
${USR_INCLUDE_HEADER}/usr/lib${IPU_VER}
218-
${USR_INCLUDE_HEADER}/android/hardware/libhardware/include/
219-
aal aal/chrome src/iutils src/jpeg
220-
modules/memory modules/memory/chrome
221-
)
222-
find_package(LIBCAMERA_CLIENT)
223-
find_package(LIBCAMERA_COMMON)
224-
find_package(LIBCAMERA_METADATA)
225-
find_package(LIBCAMERA_V4L2_DEVICE)
226-
find_package(LIBSYNC)
227-
find_package(LIBCBM)
228-
229-
include_directories(${LIBCAMERA_CLIENT_INCLUDE_DIRS} ${LIBCAMERA_COMMON_INCLUDE_DIRS}
230-
${LIBCAMERA_METADATA_INCLUDE_DIRS} ${LIBCAMERA_V4L2_DEVICE_INCLUDE_DIRS}
231-
${LIBSYNC_INCLUDE_DIRS}
232-
${LIBCBM_INCLUDE_DIRS}
233-
)
234-
link_directories(${CMAKE_PREFIX_PATH} ${LIBCAMERA_CLIENT_LIBS} ${LIBCAMERA_METADATA_LIBS}
235-
${LIBCAMERA_COMMON_LIBS} ${LIBSYNC_LIBS}
236-
${LIBCBM_LIBS}
237-
)
238-
239-
set(LIBCAMHAL_LINK_LIBS ${LIBCAMHAL_LINK_LIBS} ${LIBCAMERA_CLIENT_LIBS} ${LIBCAMERA_COMMON_LIBS}
240-
${LIBCAMERA_METADATA_LIBS} ${LIBCAMERA_V4L2_DEVICE_LIBS}
241-
${LIBSYNC_LIBS} jpeg ${CMAKE_PREFIX_PATH}/libyuv.pic.a
242-
${LIBCBM_LIBS} camera_v4l2_device
243-
)
244-
endif() #CAL_BUILD
245-
246-
if (NOT CAL_BUILD)
247-
message("Linux build")
248-
add_definitions(-DSUPPORT_MULTI_PROCESS)
249-
add_definitions(-DLINUX_BUILD)
250-
include_directories(${MODULES_DIR}/v4l2)
251-
find_package(LIBDRM)
252-
if(LIBDRM_FOUND AND ("${LIBDRM_VERSION}" VERSION_GREATER_EQUAL 2.4.114))
253-
include_directories(${LIBDRM_INCLUDE_DIRS})
254-
link_directories(${LIBDRM_LIBRARY_DIRS})
255-
set(LIBCAMHAL_LINK_LIBS ${LIBCAMHAL_LINK_LIBS} ${LIBDRM_LIBRARIES})
256-
add_definitions(-DLIBDRM_SUPPORT_MMAP_OFFSET)
257-
endif()
188+
message("Linux build")
189+
add_definitions(-DSUPPORT_MULTI_PROCESS)
190+
add_definitions(-DLINUX_BUILD)
191+
include_directories(${MODULES_DIR}/v4l2)
192+
find_package(LIBDRM)
193+
if(LIBDRM_FOUND AND ("${LIBDRM_VERSION}" VERSION_GREATER_EQUAL 2.4.114))
194+
include_directories(${LIBDRM_INCLUDE_DIRS})
195+
link_directories(${LIBDRM_LIBRARY_DIRS})
196+
set(LIBCAMHAL_LINK_LIBS ${LIBCAMHAL_LINK_LIBS} ${LIBDRM_LIBRARIES})
197+
add_definitions(-DLIBDRM_SUPPORT_MMAP_OFFSET)
258198
endif()
259199

260200
set(LIBCAMHAL_SRCS
@@ -324,9 +264,7 @@ if (IPU_VER MATCHES "ipu6")
324264
endif()
325265
endif()
326266

327-
if (NOT CAL_BUILD)
328-
set(TARGET_DEFINITIONS ${TARGET_DEFINITIONS} "-DCAMERA_DEFAULT_CFG_PATH=\"${CMAKE_INSTALL_FULL_SYSCONFDIR}/camera/${IPU_VER}/\"")
329-
endif()
267+
set(TARGET_DEFINITIONS ${TARGET_DEFINITIONS} "-DCAMERA_DEFAULT_CFG_PATH=\"${CMAKE_INSTALL_FULL_SYSCONFDIR}/camera/${IPU_VER}/\"")
330268

331269
# Link libraries, the building will be interrupted if libs/includes not found
332270
# Link ia_imaging
@@ -393,41 +331,36 @@ endif()
393331

394332

395333
#--------------------------- Install settings ---------------------------
396-
if (NOT CAL_BUILD)
397-
if (NOT BUILD_CAMHAL_PLUGIN)
398-
# Install headers
399-
install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libcamhal)
400-
if (SUPPORT_LIVE_TUNING)
401-
install(FILES modules/livetune/LiveTuning.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libcamhal/api)
402-
endif() #SUPPORT_LIVE_TUNING
403-
endif()
404-
405-
# Install configure files, by default ipu4 is used
406-
message("Install camera configure files for ${IPU_VER}")
407-
install(DIRECTORY config/linux/${IPU_VER}/ DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/camera/${IPU_VER})
408-
409-
# Install libraries
410-
set(CAMHAL_TARGETS ${CAMHAL_TARGET} ${CAMHAL_STATIC_TARGET})
411-
if (BUILD_CAMHAL_PLUGIN)
412-
set(CAMHAL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/libcamhal/plugins)
413-
else()
414-
set(CAMHAL_DESTINATION ${CMAKE_INSTALL_LIBDIR})
415-
endif()
416-
if (${CMAKE_VERSION} VERSION_LESS 3.11)
417-
install(TARGETS ${CAMHAL_TARGETS}
418-
LIBRARY DESTINATION ${CAMHAL_DESTINATION}
419-
ARCHIVE DESTINATION ${CAMHAL_DESTINATION})
420-
else()
421-
install(TARGETS ${CAMHAL_TARGETS} DESTINATION ${CAMHAL_DESTINATION})
422-
endif()
423-
if (NOT BUILD_CAMHAL_PLUGIN)
424-
# Install package config file
425-
configure_file(${PROJECT_SOURCE_DIR}/cmake/libcamhal.pc.cmakein
426-
${PROJECT_SOURCE_DIR}/libcamhal.pc @ONLY)
427-
install(FILES libcamhal.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
428-
endif()
429-
430-
endif() #NOT CAL_BUILD
334+
if (NOT BUILD_CAMHAL_PLUGIN)
335+
# Install headers
336+
install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libcamhal)
337+
if (SUPPORT_LIVE_TUNING)
338+
install(FILES modules/livetune/LiveTuning.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libcamhal/api)
339+
endif() #SUPPORT_LIVE_TUNING
340+
endif()
341+
# Install configure files, by default ipu4 is used
342+
message("Install camera configure files for ${IPU_VER}")
343+
install(DIRECTORY config/linux/${IPU_VER}/ DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/camera/${IPU_VER})
344+
# Install libraries
345+
set(CAMHAL_TARGETS ${CAMHAL_TARGET} ${CAMHAL_STATIC_TARGET})
346+
if (BUILD_CAMHAL_PLUGIN)
347+
set(CAMHAL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/libcamhal/plugins)
348+
else()
349+
set(CAMHAL_DESTINATION ${CMAKE_INSTALL_LIBDIR})
350+
endif()
351+
if (${CMAKE_VERSION} VERSION_LESS 3.11)
352+
install(TARGETS ${CAMHAL_TARGETS}
353+
LIBRARY DESTINATION ${CAMHAL_DESTINATION}
354+
ARCHIVE DESTINATION ${CAMHAL_DESTINATION})
355+
else()
356+
install(TARGETS ${CAMHAL_TARGETS} DESTINATION ${CAMHAL_DESTINATION})
357+
endif()
358+
if (NOT BUILD_CAMHAL_PLUGIN)
359+
# Install package config file
360+
configure_file(${PROJECT_SOURCE_DIR}/cmake/libcamhal.pc.cmakein
361+
${PROJECT_SOURCE_DIR}/libcamhal.pc @ONLY)
362+
install(FILES libcamhal.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
363+
endif()
431364

432365
endforeach() #IPU_VERSIONS
433366

0 commit comments

Comments
 (0)