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
7070b868
Commit
7070b868
authored
Dec 12, 2014
by
Dominik Charousset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix whitespace handling in configure script
parent
2e7aca4e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
11 deletions
+12
-11
configure
configure
+12
-11
No files found.
configure
View file @
7070b868
...
...
@@ -91,7 +91,7 @@ $benchmark_suite_options"
# $3 is the cache entry variable value
append_cache_entry
()
{
CMakeCacheEntries
=
"
$CMakeCacheEntries
-D
$1
:
$2
=
$3
"
CMakeCacheEntries
=
"
$CMakeCacheEntries
\"
-D
$1
:
$2
=
$3
\"
"
}
# Creates a build directory via CMake.
...
...
@@ -102,6 +102,7 @@ append_cache_entry ()
# $5 is the CMake generator.
configure
()
{
CMakeCacheEntries
=
$CMakeDefaultCache
if
[
-n
"
$1
"
]
;
then
...
...
@@ -138,23 +139,23 @@ configure ()
append_cache_entry LIBRARY_OUTPUT_PATH PATH
"
$absolute_builddir
/lib"
fi
if
[
-d
$workdir
]
;
then
if
[
-d
"
$workdir
"
]
;
then
# If a build directory exists, check if it has a CMake cache.
if
[
-f
$workdir
/CMakeCache.txt
]
;
then
if
[
-f
"
$workdir
/CMakeCache.txt"
]
;
then
# If the CMake cache exists, delete it so that this configuration
# is not tainted by a previous one.
rm
-f
$workdir
/CMakeCache.txt
rm
-f
"
$workdir
/CMakeCache.txt"
fi
else
mkdir
-p
$workdir
mkdir
-p
"
$workdir
"
fi
cd
$workdir
cd
"
$workdir
"
if
[
-n
"
$5
"
]
;
then
cmake
-G
"
$5
"
$CMakeCacheEntries
$sourcedir
cmake
-G
"
$5
"
$CMakeCacheEntries
"
$sourcedir
"
else
cmake
$CMakeCacheEntries
$sourcedir
cmake
$CMakeCacheEntries
"
$sourcedir
"
fi
echo
"# This is the command used to configure this build"
>
config.status
...
...
@@ -262,13 +263,13 @@ while [ $# -ne 0 ]; do
append_cache_entry CMAKE_BUILD_TYPE STRING
$optarg
;;
--build-dir
=
*
)
builddir
=
$optarg
builddir
=
"
$optarg
"
;;
--bin-dir
=
*
)
bindir
=
$optarg
bindir
=
"
$optarg
"
;;
--lib-dir
=
*
)
libdir
=
$optarg
libdir
=
"
$optarg
"
;;
--dual-build
)
dualbuild
=
1
...
...
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