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
d7a6c2b7
Commit
d7a6c2b7
authored
Jul 05, 2012
by
Dominik Charousset
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #25 from mavam/unstable
Fix configure script and print build summary.
parents
7e31d450
d7e32dc0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
27 deletions
+34
-27
CMakeLists.txt
CMakeLists.txt
+24
-1
configure
configure
+10
-26
No files found.
CMakeLists.txt
View file @
d7a6c2b7
...
@@ -17,7 +17,9 @@ set(CMAKE_CXX_FLAGS_RELEASE "-O4")
...
@@ -17,7 +17,9 @@ set(CMAKE_CXX_FLAGS_RELEASE "-O4")
set
(
CMAKE_CXX_FLAGS_RELWITHDEBINFO
"-O2 -g"
)
set
(
CMAKE_CXX_FLAGS_RELWITHDEBINFO
"-O2 -g"
)
if
(
ENABLE_DEBUG
)
if
(
ENABLE_DEBUG
)
set
(
CMAKE_BUILD_TYPE Debug
)
set
(
CMAKE_BUILD_TYPE Debug
)
add_definitions
(
"-DCPPA_DEBUG"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-DCPPA_DEBUG"
)
else
()
set
(
CMAKE_BUILD_TYPE RelWithDebInfo
)
endif
()
endif
()
if
(
"
${
CMAKE_CXX_COMPILER_ID
}
"
MATCHES
"GNU"
)
if
(
"
${
CMAKE_CXX_COMPILER_ID
}
"
MATCHES
"GNU"
)
...
@@ -203,3 +205,24 @@ add_dependencies(mailbox_performance libcppa)
...
@@ -203,3 +205,24 @@ add_dependencies(mailbox_performance libcppa)
add_dependencies
(
mixed_case libcppa
)
add_dependencies
(
mixed_case libcppa
)
add_dependencies
(
distributed libcppa
)
add_dependencies
(
distributed libcppa
)
add_dependencies
(
matching libcppa
)
add_dependencies
(
matching libcppa
)
string
(
TOUPPER
${
CMAKE_BUILD_TYPE
}
build_type
)
message
(
"
\n
====================| Build Summary |===================="
"
\n
"
"
\n
Libcppa version:
${
LIBRARY_VERSION
}
"
"
\n
"
"
\n
Source directory:
${
CMAKE_SOURCE_DIR
}
"
"
\n
Build directory:
${
CMAKE_BINARY_DIR
}
"
"
\n
Executable path:
${
EXECUTABLE_OUTPUT_PATH
}
"
"
\n
Library path:
${
LIBRARY_OUTPUT_PATH
}
"
"
\n
Install prefix:
${
CMAKE_INSTALL_PREFIX
}
"
"
\n
Debug mode:
${
ENABLE_DEBUG
}
"
"
\n
"
"
\n
CXX:
${
CMAKE_CXX_COMPILER
}
"
"
\n
CXXFLAGS:
${
CMAKE_CXX_FLAGS
}
${
CMAKE_CXX_FLAGS_
${
build_type
}}
"
"
\n
"
"
\n
Boost:
${
Boost_INCLUDE_DIR
}
"
"
\n
"
"
\n
===========================================================
\n
"
)
configure
View file @
d7a6c2b7
...
@@ -59,15 +59,10 @@ append_cache_entry ()
...
@@ -59,15 +59,10 @@ append_cache_entry ()
# $5 is the CMake generator.
# $5 is the CMake generator.
configure
()
configure
()
{
{
CMakeCacheEntries
=
""
CMakeCacheEntries
=
$CMakeDefaultCache
echo
"-------------------------------------------------"
if
[
-n
"
$1
"
]
;
then
if
[
-n
"
$1
"
]
;
then
append_cache_entry CMAKE_CXX_COMPILER FILEPATH
$1
append_cache_entry CMAKE_CXX_COMPILER FILEPATH
$1
echo
"compiler:
$1
"
else
echo
"compiler: system default"
fi
fi
if
[
-n
"
$2
"
]
;
then
if
[
-n
"
$2
"
]
;
then
...
@@ -76,26 +71,19 @@ configure ()
...
@@ -76,26 +71,19 @@ configure ()
workdir
=
$builddir
workdir
=
$builddir
fi
fi
workdirs
=
"
$workdirs
$workdir
"
workdirs
=
"
$workdirs
$workdir
"
echo
"build directory:
$workdir
"
if
[
-n
"
$3
"
]
;
then
if
[
-n
"
$3
"
]
;
then
append_cache_entry EXECUTABLE_OUTPUT_PATH PATH
$3
append_cache_entry EXECUTABLE_OUTPUT_PATH PATH
$3
echo
"executable output directory:
$3
"
else
else
append_cache_entry EXECUTABLE_OUTPUT_PATH PATH
"
$workdir
/bin"
append_cache_entry EXECUTABLE_OUTPUT_PATH PATH
"
$workdir
/bin"
echo
"executable output directory:
$workdir
/bin"
fi
fi
if
[
-n
"
$4
"
]
;
then
if
[
-n
"
$4
"
]
;
then
append_cache_entry LIBRARY_OUTPUT_PATH PATH
$4
append_cache_entry LIBRARY_OUTPUT_PATH PATH
$4
echo
"library output directory:
$4
"
else
else
append_cache_entry LIBRARY_OUTPUT_PATH PATH
"
$workdir
/lib"
append_cache_entry LIBRARY_OUTPUT_PATH PATH
"
$workdir
/lib"
echo
"library output directory:
$workdir
/lib"
fi
fi
echo
"-------------------------------------------------"
if
[
-d
$workdir
]
;
then
if
[
-d
$workdir
]
;
then
# If a build directory exists, check if it has a CMake cache.
# If a build directory exists, check if it has a CMake cache.
if
[
-f
$workdir
/CMakeCache.txt
]
;
then
if
[
-f
$workdir
/CMakeCache.txt
]
;
then
...
@@ -176,6 +164,10 @@ while [ $# -ne 0 ]; do
...
@@ -176,6 +164,10 @@ while [ $# -ne 0 ]; do
shift
shift
done
done
# At this point we save the global CMake variables so that configure() can
# later use them.
CMakeDefaultCache
=
$CMakeCacheEntries
if
[
-n
"
$dualbuild
"
]
;
then
if
[
-n
"
$dualbuild
"
]
;
then
# Use what we got in $PATH if --with-clang or --with-gcc is not specified.
# Use what we got in $PATH if --with-clang or --with-gcc is not specified.
if
[
-z
"
$clang
"
]
;
then
if
[
-z
"
$clang
"
]
;
then
...
@@ -202,33 +194,25 @@ fi
...
@@ -202,33 +194,25 @@ fi
echo
"DIRS :=
$workdirs
\n
"
>
$sourcedir
/Makefile
echo
"DIRS :=
$workdirs
\n
"
>
$sourcedir
/Makefile
read
-d
''
makefile
<<
"
EOT
"
read
-d
''
makefile
<<
"
EOT
"
all:
configured
all:
@for i in
$(
DIRS
)
; do
$(
MAKE
)
-C
$$
i
$@
; done
@for i in
$(
DIRS
)
; do
$(
MAKE
)
-C
$$
i
$@
; done
configured:
test:
@for i in
$(
DIRS
)
; do
\\
test -d
$$
i ||
\\
( echo "Error: No build directory found. Did you run configure?" && exit 1 );
\\
test -e
$$
i/Makefile ||
\\
( echo "Error: No Makefile in build directory found. Did you run configure?" && exit 1 );
\\
done
test: configured
@for i in
$(
DIRS
)
; do
$(
MAKE
)
-C
$$
i
$@
; done
@for i in
$(
DIRS
)
; do
$(
MAKE
)
-C
$$
i
$@
; done
install:
install:
@for i in
$(
DIRS
)
; do
$(
MAKE
)
-C
$$
i
$@
; done
@for i in
$(
DIRS
)
; do
$(
MAKE
)
-C
$$
i
$@
; done
uninstall:
configured
uninstall:
@for i in
$(
DIRS
)
; do
$(
MAKE
)
-C
$$
i
$@
; done
@for i in
$(
DIRS
)
; do
$(
MAKE
)
-C
$$
i
$@
; done
clean:
configured
clean:
@for i in
$(
DIRS
)
; do
$(
MAKE
)
-C
$$
i
$@
; done
@for i in
$(
DIRS
)
; do
$(
MAKE
)
-C
$$
i
$@
; done
distclean:
distclean:
rm -rf
$(
DIRS
)
Makefile
rm -rf
$(
DIRS
)
Makefile
.PHONY: all
configured
test install uninstall clean distclean
.PHONY: all test install uninstall clean distclean
EOT
EOT
echo
"
$makefile
"
>>
$sourcedir
/Makefile
echo
"
$makefile
"
>>
$sourcedir
/Makefile
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