diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-06-04 22:09:25 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-06-04 22:09:25 +0800 |
| commit | b7c12f52ef1848afec6e31ccea32ca86cd7ceef2 (patch) | |
| tree | 39f3ee4ce9b24bf20e12a1eeeb6aa238969fc25a | |
| parent | 4497b343cb96b12567f2eedfa93d33d0a5b66f76 (diff) | |
Set ColladaDOM to refer to vcpkg Boost
Turns out I couldn't repeat self-building ColladaDOM using SLv prebuilt
Boost successfully, because of the zlib, minizip, libxml2 header
directories search confusion, no matter how I tried tinkering with LL's
ColladaDOM fork CXX_FLAGS and/or EXTRA_COMPILE_FLAGS settings.
With vcpkg Boost, self-building ColladaDOM in the viewer CMake
configuration stage goes smoothly (compiling ColladaDOM on Windows could
take a while, though.. at least on my system).
| -rw-r--r-- | indra/cmake/LLPrimitive.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake index a8b328b84b..6a24f62619 100644 --- a/indra/cmake/LLPrimitive.cmake +++ b/indra/cmake/LLPrimitive.cmake @@ -59,9 +59,9 @@ else () set(BOOST_LIBS -L${Minizip_LIBRARY_DIRS}exec/boost/1.87/lib) set(BOOST_LIBRARY_SUFFIX -mt) elseif( WINDOWS ) - set(BOOST_CFLAGS -I${LIBS_PREBUILT_DIR}/include) - set(BOOST_LIBS -L${ARCH_PREBUILT_DIRS_RELEASE}) - set(BOOST_LIBRARY_SUFFIX -mt-x${ADDRESS_SIZE}) + set(BOOST_CFLAGS -I${prefix_result}/../include) + set(BOOST_LIBS -L${prefix_result}) + set(BOOST_LIBRARY_SUFFIX -vc143-mt-x64-1_88) endif() file(MAKE_DIRECTORY ${LIBS_PREBUILT_DIR}/include/collada/1.4) try_compile(COLLADADOM_RESULT |