mirror of
https://github.com/loot/libloot.git
synced 2026-07-27 14:16:01 -07:00
Update yaml-cpp to yaml-cpp-0.7.0+merge-key-support.1
This commit is contained in:
+4
-12
@@ -176,23 +176,15 @@ ENDIF()
|
||||
|
||||
ExternalProject_Add(yaml-cpp
|
||||
PREFIX "external"
|
||||
URL "https://github.com/loot/yaml-cpp/archive/yaml-cpp-0.6.2+merge-key-support.2.tar.gz"
|
||||
CMAKE_ARGS -DMSVC_SHARED_RT=${MSVC_SHARED_RUNTIME} -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
|
||||
URL "https://github.com/loot/yaml-cpp/archive/yaml-cpp-0.7.0+merge-key-support.1.tar.gz"
|
||||
CMAKE_ARGS -DYAML_MSVC_SHARED_RT=${MSVC_SHARED_RUNTIME} -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DYAML_BUILD_SHARED_LIBS=OFF
|
||||
BUILD_COMMAND ${YAMLCPP_BUILD_COMMAND}
|
||||
INSTALL_COMMAND "")
|
||||
ExternalProject_Get_Property(yaml-cpp SOURCE_DIR BINARY_DIR)
|
||||
|
||||
if (MSVC)
|
||||
if (MSVC_STATIC_RUNTIME)
|
||||
set(YAML_CPP_LIBRARY_SUFFIX "${YAML_CPP_LIBRARY_SUFFIX}mt")
|
||||
else()
|
||||
set(YAML_CPP_LIBRARY_SUFFIX "${YAML_CPP_LIBRARY_SUFFIX}md")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
set(YAML_CPP_LIBRARY_SUFFIX "${LIB_SUFFIX}${YAML_CPP_LIBRARY_SUFFIX}$<$<CONFIG:Debug>:d>${CMAKE_STATIC_LIBRARY_SUFFIX}")
|
||||
set(YAML_CPP_LIBRARY_SUFFIX "$<$<CONFIG:Debug>:d>${CMAKE_STATIC_LIBRARY_SUFFIX}")
|
||||
set(YAML_CPP_INCLUDE_DIRS "${SOURCE_DIR}/include")
|
||||
set(YAML_CPP_LIBRARIES "${BINARY_DIR}/${CMAKE_CFG_INTDIR}/libyaml-cpp${YAML_CPP_LIBRARY_SUFFIX}")
|
||||
set(YAML_CPP_LIBRARIES "${BINARY_DIR}/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}yaml-cpp${YAML_CPP_LIBRARY_SUFFIX}")
|
||||
|
||||
|
||||
##############################
|
||||
|
||||
Reference in New Issue
Block a user