Explorar o código

fix bug of yaml

Channingss %!s(int64=5) %!d(string=hai) anos
pai
achega
b8c37dc6ec
Modificáronse 2 ficheiros con 9 adicións e 1 borrados
  1. 8 0
      deploy/cpp/CMakeLists.txt
  2. 1 1
      deploy/cpp/cmake/yaml-cpp.cmake

+ 8 - 0
deploy/cpp/CMakeLists.txt

@@ -15,6 +15,12 @@ SET(CUDA_LIB "" CACHE PATH "Location of libraries")
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/demo)
+
+if (NOT WIN32)
+    SET(YAML_BUILD_TYPE ON CACHE BOOL "yaml build shared library.")
+else()
+    SET(YAML_BUILD_TYPE OFF CACHE BOOL "yaml build shared library.")
+endif()
 include(cmake/yaml-cpp.cmake)
 
 include_directories("${CMAKE_SOURCE_DIR}/")
@@ -31,6 +37,7 @@ macro(safe_set_static_flag)
     endforeach(flag_var)
 endmacro()
 
+
 if (WITH_ENCRYPTION)
 add_definitions( -DWITH_ENCRYPTION=${WITH_ENCRYPTION})
 endif()
@@ -191,6 +198,7 @@ else()
     set(DEPS ${DEPS}
         ${MATH_LIB} ${MKLDNN_LIB}
         glog gflags_static libprotobuf zlibstatic xxhash libyaml-cppmt)
+
     set(DEPS ${DEPS} libcmt shlwapi)
     if (EXISTS "${PADDLE_DIR}/third_party/install/snappy/lib")
         set(DEPS ${DEPS} snappy)

+ 1 - 1
deploy/cpp/cmake/yaml-cpp.cmake

@@ -14,7 +14,7 @@ ExternalProject_Add(
         -DYAML_CPP_INSTALL=OFF
         -DYAML_CPP_BUILD_CONTRIB=OFF
         -DMSVC_SHARED_RT=OFF
-        -DBUILD_SHARED_LIBS=ON
+        -DBUILD_SHARED_LIBS=${YAML_BUILD_TYPE}
         -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
         -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
         -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}