Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
28bb9877
Commit
28bb9877
authored
10 years ago
by
Oz Linden
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
indra/cmake/FindAutobuild.cmake
+16
-11
16 additions, 11 deletions
indra/cmake/FindAutobuild.cmake
with
16 additions
and
11 deletions
indra/cmake/FindAutobuild.cmake
+
16
−
11
View file @
28bb9877
...
@@ -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
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment