Merge branch 'blender-v4.1-release'
This commit is contained in:
commit
8c16b612ca
|
@ -37,21 +37,22 @@ else()
|
||||||
unset(LIBDIR_GLIBC228_ABI)
|
unset(LIBDIR_GLIBC228_ABI)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(NOT DEFINED LIBDIR OR NOT (EXISTS ${LIBDIR}))
|
if(NOT DEFINED LIBDIR)
|
||||||
|
set(LIBDIR "") # Suppress undefined warnings, allow printing even if empty.
|
||||||
|
endif()
|
||||||
|
if((LIBDIR STREQUAL "") OR (NOT (EXISTS "${LIBDIR}")))
|
||||||
if(WITH_STRICT_BUILD_OPTIONS)
|
if(WITH_STRICT_BUILD_OPTIONS)
|
||||||
message(SEND_ERROR
|
message(SEND_ERROR
|
||||||
"Unable to find LIBDIR: ${LIBDIR}. "
|
"Unable to find LIBDIR: \"${LIBDIR}\". "
|
||||||
"WITH_LIBS_PRECOMPILED needs to be able to find the LIBDIR for the precompiled libraries."
|
"WITH_LIBS_PRECOMPILED needs to be able to find the LIBDIR for the precompiled libraries."
|
||||||
)
|
)
|
||||||
else()
|
else()
|
||||||
message(STATUS
|
message(STATUS
|
||||||
"Unable to find LIBDIR: ${LIBDIR}. system libraries may be used "
|
"Unable to find LIBDIR: \"${LIBDIR}\". system libraries may be used "
|
||||||
"(disable WITH_LIBS_PRECOMPILED to suppress this message)."
|
"(disable WITH_LIBS_PRECOMPILED to suppress this message)."
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
if(DEFINED LIBDIR)
|
unset(LIBDIR)
|
||||||
unset(LIBDIR)
|
|
||||||
endif()
|
|
||||||
set(WITH_LIBS_PRECOMPILED OFF)
|
set(WITH_LIBS_PRECOMPILED OFF)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
Loading…
Reference in New Issue