Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
Actor Framework
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
Actor Framework
Commits
8151d11d
Commit
8151d11d
authored
Feb 27, 2020
by
Dominik Charousset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Auto-detect cmake3 binaries
parent
27cf1dc3
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
11 deletions
+21
-11
configure
configure
+21
-11
No files found.
configure
View file @
8151d11d
...
...
@@ -2,15 +2,6 @@
# Convenience wrapper for easily viewing/setting options that
# the project's CMake scripts will recognize.
# check for `cmake` command
type
cmake
>
/dev/null 2>&1
||
{
echo
"
\
This package requires CMake, please install it first, then you may
use this configure script to access CMake equivalent functionality.
\
"
>
&2
;
exit
1
;
}
command
=
"
$0
$*
"
dirname_0
=
`
dirname
$0
`
sourcedir
=
`
cd
$dirname_0
&&
pwd
`
...
...
@@ -19,6 +10,7 @@ usage="\
Usage:
$0
[OPTION]... [VAR=VALUE]...
Build Options:
--cmake=PATH set a custom path to the CMake binary
--generator=GENERATOR set CMake generator (see cmake --help)
--build-type=TYPE set CMake build type [RelWithDebInfo]:
- Debug: debugging flags enabled
...
...
@@ -175,9 +167,9 @@ configure ()
cd
"
$workdir
"
if
[
-n
"
$5
"
]
;
then
cmake
-G
"
$5
"
$CMakeCacheEntries
"
$sourcedir
"
"
$CMakeCommand
"
-G
"
$5
"
$CMakeCacheEntries
"
$sourcedir
"
else
cmake
$CMakeCacheEntries
"
$sourcedir
"
"
$CMakeCommand
"
$CMakeCacheEntries
"
$sourcedir
"
fi
printf
"#!/bin/sh
\n\n
"
>
config.status
...
...
@@ -223,6 +215,9 @@ while [ $# -ne 0 ]; do
echo
"
${
usage
}
"
1>&2
exit
1
;;
--cmake
=
*
)
CMakeCommand
=
"
$optarg
"
;;
--generator
=
*
)
CMakeGenerator
=
"
$optarg
"
;;
...
...
@@ -359,6 +354,21 @@ while [ $# -ne 0 ]; do
shift
done
# Check for `cmake` command.
if
[
-z
"
$CMakeCommand
"
]
;
then
# prefer cmake3 over "regular" cmake (cmake == cmake2 on RHEL)
if
command
-v
cmake3
>
/dev/null 2>&1
;
then
CMakeCommand
=
"cmake3"
elif
command
-v
cmake
>
/dev/null 2>&1
;
then
CMakeCommand
=
"cmake"
else
echo
"This package requires CMake, please install it first."
echo
"Then you may use this script to configure the CMake build."
echo
"Note: pass --cmake=PATH to use cmake in non-standard locations."
exit
1
;
fi
fi
# At this point we save the global CMake variables so that configure() can
# later use them.
CMakeDefaultCache
=
$CMakeCacheEntries
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment