Skip to content
Snippets Groups Projects
Commit 28bb9877 authored by Oz Linden's avatar Oz Linden
Browse files

use the value established by autobuild itself when finding autobuild

parent 3fbf0f87
No related branches found
No related tags found
No related merge requests found
...@@ -6,10 +6,14 @@ ...@@ -6,10 +6,14 @@
# #
# AUTOBUILD_EXECUTABLE - path to autobuild or pautobuild executable # AUTOBUILD_EXECUTABLE - path to autobuild or pautobuild executable
# *TODO - if cmake was executed by autobuild, autobuild will have set the AUTOBUILD env var
# update this to check for that case
IF (NOT AUTOBUILD_EXECUTABLE) IF (NOT AUTOBUILD_EXECUTABLE)
# If cmake was executed by autobuild, autobuild will have set the AUTOBUILD env var
IF (DEFINED ENV{AUTOBUILD})
SET(AUTOBUILD_EXECUTABLE $ENV{AUTOBUILD})
ELSE (DEFINED ENV{AUTOBUILD})
IF(WIN32) IF(WIN32)
SET(AUTOBUILD_EXE_NAMES autobuild.cmd autobuild.exe) SET(AUTOBUILD_EXE_NAMES autobuild.cmd autobuild.exe)
ELSE(WIN32) ELSE(WIN32)
...@@ -27,15 +31,16 @@ IF (NOT AUTOBUILD_EXECUTABLE) ...@@ -27,15 +31,16 @@ IF (NOT AUTOBUILD_EXECUTABLE)
${CMAKE_SOURCE_DIR}/../../.. ${CMAKE_SOURCE_DIR}/../../..
PATH_SUFFIXES "/autobuild/bin/" PATH_SUFFIXES "/autobuild/bin/"
) )
ENDIF (DEFINED ENV{AUTOBUILD})
IF (AUTOBUILD_EXECUTABLE) IF (AUTOBUILD_EXECUTABLE)
GET_FILENAME_COMPONENT(_autobuild_name ${AUTOBUILD_EXECUTABLE} NAME_WE) GET_FILENAME_COMPONENT(_autobuild_name ${AUTOBUILD_EXECUTABLE} NAME_WE)
MESSAGE(STATUS "Using autobuild at: ${AUTOBUILD_EXECUTABLE}") MESSAGE(STATUS "Using autobuild at: ${AUTOBUILD_EXECUTABLE}")
ELSE (AUTOBUILD_EXECUTABLE) ELSE (AUTOBUILD_EXECUTABLE)
IF (AUTOBUILD_FIND_REQUIRED) IF (AUTOBUILD_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find autobuild executable") MESSAGE(FATAL_ERROR "Could not find autobuild executable")
ENDIF (AUTOBUILD_FIND_REQUIRED) ENDIF (AUTOBUILD_FIND_REQUIRED)
ENDIF (AUTOBUILD_EXECUTABLE) ENDIF (AUTOBUILD_EXECUTABLE)
MARK_AS_ADVANCED(AUTOBUILD_EXECUTABLE) MARK_AS_ADVANCED(AUTOBUILD_EXECUTABLE)
ENDIF (NOT AUTOBUILD_EXECUTABLE) ENDIF (NOT AUTOBUILD_EXECUTABLE)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment