diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2020-11-30 00:01:33 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2020-11-30 00:01:33 +0300 |
| commit | dca9aa0053f7d711c1b42a4f2042827a1e286bea (patch) | |
| tree | 89ff74b5ec88860a51bc94dfa319dfb32ac3e860 /build_files/cmake | |
| parent | 176324aa5cfcf0703dfae296028bc3aef1ff5f14 (diff) | |
Deps: PugiXML 1.10
This separates out PugiXML that was previously
bundled by OIIO.
As this linux/mac libs are not available
this commit only contains the builder and windows
changes, and the option to enable pugixml is
guarded by a platform if, this can be removed
once all platforms have committed the svn libs.
For details see D8628
Diffstat (limited to 'build_files/cmake')
| -rw-r--r-- | build_files/cmake/platform/platform_win32.cmake | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index ac08c1a5fa9..3954a5f143c 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -253,6 +253,11 @@ foreach(child ${children}) endif() endforeach() +if(WITH_PUGIXML) + set(PUGIXML_LIBRARIES optimized ${LIBDIR}/pugixml/lib/pugixml.lib debug ${LIBDIR}/pugixml/lib/pugixml_d.lib) + set(PUGIXML_INCLUDE_DIR ${LIBDIR}/pugixml/include) +endif() + set(ZLIB_INCLUDE_DIRS ${LIBDIR}/zlib/include) set(ZLIB_LIBRARIES ${LIBDIR}/zlib/lib/libz_st.lib) set(ZLIB_INCLUDE_DIR ${LIBDIR}/zlib/include) @@ -651,11 +656,10 @@ if(WITH_CYCLES_OSL) optimized ${OSL_LIB_COMP} optimized ${OSL_LIB_EXEC} optimized ${OSL_LIB_QUERY} - optimized ${CYCLES_OSL}/lib/pugixml.lib debug ${OSL_LIB_EXEC_DEBUG} debug ${OSL_LIB_COMP_DEBUG} debug ${OSL_LIB_QUERY_DEBUG} - debug ${CYCLES_OSL}/lib/pugixml_d.lib + ${PUGIXML_LIBRARIES} ) find_path(OSL_INCLUDE_DIR OSL/oslclosure.h PATHS ${CYCLES_OSL}/include) find_program(OSL_COMPILER NAMES oslc PATHS ${CYCLES_OSL}/bin) |