diff --git a/cmake/external/opencv.cmake b/cmake/external/opencv.cmake index 1d64476b134a875926c5c3f90e610bd69e6ad3ac..e130b7e66184be4bbdd616569c261102a1ffc43e 100644 --- a/cmake/external/opencv.cmake +++ b/cmake/external/opencv.cmake @@ -42,9 +42,12 @@ ExternalProject_Add( -DBUILD_PERF_TESTS=OFF -DCMAKE_BUILD_TYPE=${THIRD_PARTY_BUILD_TYPE} -DWITH_EIGEN=OFF - -DWITH_JPEG=OFF - -DWITH_PNG=OFF - -DWITH_TIFF=OFF + -DWITH_JPEG=ON + -DBUILD_JPEG=ON + -DWITH_PNG=ON + -DBUILD_PNG=ON + -DWITH_TIFF=ON + -DBUILD_TIFF=ON -DBUILD_SHARED_LIBS=OFF ${EXTERNAL_OPTIONAL_ARGS} CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${OPENCV_INSTALL_DIR} @@ -106,6 +109,15 @@ SET_PROPERTY(TARGET libjasper PROPERTY IMPORTED_LOCATION ${BINARY_DIR}/3rdparty/ ADD_LIBRARY(libwebp STATIC IMPORTED GLOBAL) SET_PROPERTY(TARGET libwebp PROPERTY IMPORTED_LOCATION ${BINARY_DIR}/3rdparty/lib/liblibwebp.a) +ADD_LIBRARY(libjpeg STATIC IMPORTED GLOBAL) +SET_PROPERTY(TARGET libjpeg PROPERTY IMPORTED_LOCATION ${BINARY_DIR}/3rdparty/lib/liblibjpeg.a) + +ADD_LIBRARY(libpng STATIC IMPORTED GLOBAL) +SET_PROPERTY(TARGET libpng PROPERTY IMPORTED_LOCATION ${BINARY_DIR}/3rdparty/lib/liblibpng.a) + +ADD_LIBRARY(libtiff STATIC IMPORTED GLOBAL) +SET_PROPERTY(TARGET libtiff PROPERTY IMPORTED_LOCATION ${BINARY_DIR}/3rdparty/lib/liblibtiff.a) + #ADD_LIBRARY(zlib STATIC IMPORTED GLOBAL) #SET_PROPERTY(TARGET zlib PROPERTY IMPORTED_LOCATION ${BINARY_DIR}/3rdparty/lib/libzlib.a) @@ -116,4 +128,7 @@ LIST(APPEND opencv_depend_libs IlmImf libjasper libwebp + libjpeg + libpng + libtiff zlib) diff --git a/cmake/flags.cmake b/cmake/flags.cmake index 55ce71aa15ffb43497197118fa8fdd97428ed4da..cd790d03947ab8887653d52b9e206a3d9aaa051e 100644 --- a/cmake/flags.cmake +++ b/cmake/flags.cmake @@ -115,6 +115,7 @@ SET(CMAKE_EXTRA_INCLUDE_FILES "") if (NOT WIN32) set(COMMON_FLAGS -D__const__= + -DUSE_PTHREAD -fPIC -fno-omit-frame-pointer -Wall diff --git a/sdk-cpp/include/endpoint_config.h b/sdk-cpp/include/endpoint_config.h index 76636f3f61ddf56970b5ce60f17863848d3679d5..4c272aac6c2bac81e633f9128cce6ffd11f2b20b 100644 --- a/sdk-cpp/include/endpoint_config.h +++ b/sdk-cpp/include/endpoint_config.h @@ -15,6 +15,7 @@ **/ #include "common.h" +#include #ifndef BAIDU_PADDLE_SERVING_SDK_CPP_ENDPOINT_CONFIG_H #define BAIDU_PADDLE_SERVING_SDK_CPP_ENDPOINT_CONFIG_H @@ -52,6 +53,9 @@ template struct type_traits { static type_traits tag; }; +template +type_traits type_traits::tag; + template struct ConfigItem { T value; bool init;