Material: fix windows debug builds
Material: fix cmake linking of yaml-cpp<0.7.0 write version in final report
This commit is contained in:
committed by
Chris Hennes
parent
cd94350df0
commit
5a960792e5
@@ -180,6 +180,7 @@ macro(PrintFinalReport)
|
||||
conditional(Coin3D_DOC COIN3D_DOC_FOUND "not found" ${COIN3D_DOC_PATH})
|
||||
conditional(PYCXX PYCXX_FOUND "not found" "${PYCXX_VERSION} Incl: ${PYCXX_INCLUDE_DIR} Src:${PYCXX_SOURCE_DIR}")
|
||||
conditional(fmt fmt_FOUND "Sources downloaded to ${fmt_SOURCE_DIR}" "${fmt_VERSION}")
|
||||
conditional(yaml-cpp yaml-cpp_FOUND "not found" "${yaml-cpp_VERSION}")
|
||||
|
||||
section_end()
|
||||
|
||||
|
||||
@@ -30,9 +30,18 @@ include_directories(
|
||||
)
|
||||
list(APPEND Material_LIBS
|
||||
${QtConcurrent_LIBRARIES}
|
||||
${YAML_CPP_LIBRARIES}
|
||||
)
|
||||
|
||||
if(yaml-cpp_VERSION VERSION_LESS 0.7.0)
|
||||
list(APPEND Material_LIBS
|
||||
${YAML_CPP_LIBRARIES}
|
||||
)
|
||||
else()
|
||||
list(APPEND Material_LIBS
|
||||
yaml-cpp::yaml-cpp
|
||||
)
|
||||
endif()
|
||||
|
||||
generate_from_xml(Array2DPy)
|
||||
generate_from_xml(Array3DPy)
|
||||
generate_from_xml(MaterialManagerPy)
|
||||
|
||||
Reference in New Issue
Block a user