diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-15 11:16:27 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-15 11:16:27 +0300 |
| commit | bccc10db9a90d365c353baebf443fde2030ce970 (patch) | |
| tree | 2c2e1fd94b29667a809f8d7285d049f5ff5d424d /indra/cmake/FindAutobuild.cmake | |
| parent | 531cd34f670170ade57f8813fe48012b61a1d3c2 (diff) | |
| parent | bb3c36f5cbc0c3b542045fd27255eee24e03da22 (diff) | |
Merge branch 'main' into marchcat/x-b-merge
# Conflicts:
# autobuild.xml
# indra/cmake/ConfigurePkgConfig.cmake
# indra/cmake/ICU4C.cmake
# indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp
# indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.h
# indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
# indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
# indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h
# indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llfloateremojipicker.cpp
# indra/newview/lloutfitslist.cpp
Diffstat (limited to 'indra/cmake/FindAutobuild.cmake')
| -rw-r--r-- | indra/cmake/FindAutobuild.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/cmake/FindAutobuild.cmake b/indra/cmake/FindAutobuild.cmake index ea5ad6d108..79287d4e01 100644 --- a/indra/cmake/FindAutobuild.cmake +++ b/indra/cmake/FindAutobuild.cmake @@ -22,11 +22,11 @@ IF (NOT AUTOBUILD_EXECUTABLE) SET(AUTOBUILD_EXECUTABLE) FIND_PROGRAM( - AUTOBUILD_EXECUTABLE + AUTOBUILD_EXECUTABLE NAMES ${AUTOBUILD_EXE_NAMES} - PATHS + PATHS ENV PATH - ${CMAKE_SOURCE_DIR}/.. + ${CMAKE_SOURCE_DIR}/.. ${CMAKE_SOURCE_DIR}/../.. ${CMAKE_SOURCE_DIR}/../../.. PATH_SUFFIXES "/autobuild/bin/" |