Commit 7352136d authored by Dominik Charousset's avatar Dominik Charousset

Merge pull request #35 from mavam/topic/build-harness

Tweaks for the configure script
parents d45b8c6a cba355bc
...@@ -10,34 +10,49 @@ endif () ...@@ -10,34 +10,49 @@ endif ()
set (CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}) set (CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
set(CMAKE_CXX_FLAGS "-std=c++11 -Wextra -Wall -pedantic") # Check if the user provided CXXFLAGS on the command line.
set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g") if (CMAKE_CXX_FLAGS)
set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os") set(CXXFLAGS_PROVIDED true)
set(CMAKE_CXX_FLAGS_RELEASE "-O4") ENDIF ()
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
if (ENABLE_DEBUG) if (CXXFLAGS_PROVIDED)
set(CMAKE_BUILD_TYPE Debug) set(CMAKE_CXX_FLAGS_DEBUG "")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DCPPA_DEBUG") set(CMAKE_CXX_FLAGS_MINSIZEREL "")
set(CMAKE_CXX_FLAGS_RELEASE "")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "")
else () else ()
set(CMAKE_BUILD_TYPE RelWithDebInfo) set(CMAKE_CXX_FLAGS "-std=c++11 -Wextra -Wall -pedantic")
set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os")
set(CMAKE_CXX_FLAGS_RELEASE "-O4")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
endif () endif ()
if (DISABLE_CONTEXT_SWITCHING) if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DCPPA_DISABLE_CONTEXT_SWITCHING")
endif()
if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
OUTPUT_VARIABLE GCC_VERSION) OUTPUT_VARIABLE GCC_VERSION)
if (NOT (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)) if (NOT (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7))
message(FATAL_ERROR "${PROJECT_NAME} requires g++ 4.7 or greater.") message(FATAL_ERROR "${PROJECT_NAME} requires g++ 4.7 or greater.")
endif () endif ()
elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") if (NOT CXXFLAGS_PROVIDED)
else() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
endif ()
else ()
message(FATAL_ERROR "Your C++ compiler does not support C++11.") message(FATAL_ERROR "Your C++ compiler does not support C++11.")
endif () endif ()
if (ENABLE_DEBUG)
set(CMAKE_BUILD_TYPE Debug)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DCPPA_DEBUG")
else ()
set(CMAKE_BUILD_TYPE RelWithDebInfo)
endif ()
if (DISABLE_CONTEXT_SWITCHING)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DCPPA_DISABLE_CONTEXT_SWITCHING")
endif()
set(LIBCPPA_SRC set(LIBCPPA_SRC
src/abstract_tuple.cpp src/abstract_tuple.cpp
src/actor.cpp src/actor.cpp
...@@ -206,22 +221,30 @@ add_dependencies(distributed libcppa) ...@@ -206,22 +221,30 @@ add_dependencies(distributed libcppa)
add_dependencies(matching libcppa) add_dependencies(matching libcppa)
string(TOUPPER ${CMAKE_BUILD_TYPE} build_type) string(TOUPPER ${CMAKE_BUILD_TYPE} build_type)
set(CONTEXT_SWITCHING true)
if (DISABLE_CONTEXT_SWITCHING)
set(CONTEXT_SWITCHING false)
endif()
message( message(
"\n====================| Build Summary |====================" "\n====================| Build Summary |===================="
"\n" "\n"
"\nLibcppa version: ${LIBRARY_VERSION}" "\nLibcppa version: ${LIBRARY_VERSION}"
"\n"
"\nBuild type: ${CMAKE_BUILD_TYPE}"
"\nDebug mode: ${ENABLE_DEBUG}"
"\nContext switching: ${CONTEXT_SWITCHING}"
"\n" "\n"
"\nSource directory: ${CMAKE_SOURCE_DIR}" "\nCXX: ${CMAKE_CXX_COMPILER}"
"\nBuild directory: ${CMAKE_BINARY_DIR}" "\nCXXFLAGS: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${build_type}}"
"\nExecutable path: ${EXECUTABLE_OUTPUT_PATH}"
"\nLibrary path: ${LIBRARY_OUTPUT_PATH}"
"\nInstall prefix: ${CMAKE_INSTALL_PREFIX}"
"\nDebug mode: ${ENABLE_DEBUG}"
"\n" "\n"
"\nCXX: ${CMAKE_CXX_COMPILER}" "\nSource directory: ${CMAKE_SOURCE_DIR}"
"\nCXXFLAGS: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${build_type}}" "\nBuild directory: ${CMAKE_BINARY_DIR}"
"\nExecutable path: ${EXECUTABLE_OUTPUT_PATH}"
"\nLibrary path: ${LIBRARY_OUTPUT_PATH}"
"\nInstall prefix: ${CMAKE_INSTALL_PREFIX}"
"\n" "\n"
"\nBoost: ${Boost_INCLUDE_DIR}" "\nBoost: ${Boost_INCLUDE_DIR}"
"\n" "\n"
"\n===========================================================\n" "\n===========================================================\n"
) )
...@@ -17,12 +17,17 @@ usage="\ ...@@ -17,12 +17,17 @@ usage="\
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
Build Options: Build Options:
--builddir=DIR place build files in directory [build]
--generator=GENERATOR CMake generator to use (see cmake --help) --generator=GENERATOR CMake generator to use (see cmake --help)
--with-clang=FILE path to clang++ executable --build-type=DIR CMake build type: [RelWithDebInfo]
--with-gcc=FILE path to g++ executable - Debug: debugging flags enabled
- MinSizeRel: minimal output size
- Release: optimizations on, debugging off
- RelWithDebInfo: release flags plus debugging
--build-dir=DIR place build files in directory [build]
--bin-dir=DIR executable directory [build/bin] --bin-dir=DIR executable directory [build/bin]
--lib-dir=DIR library directory [build/lib] --lib-dir=DIR library directory [build/lib]
--with-clang=FILE path to clang++ executable
--with-gcc=FILE path to g++ executable
--dual-build build both with gcc and clang --dual-build build both with gcc and clang
Installation Directories: Installation Directories:
...@@ -30,6 +35,7 @@ Usage: $0 [OPTION]... [VAR=VALUE]... ...@@ -30,6 +35,7 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
Optional Features: Optional Features:
--enable-debug compile in debugging mode --enable-debug compile in debugging mode
(always sets --build-type=Debug)
--enable-perftools use Google perftools --enable-perftools use Google perftools
Platform-Dependent Adjustments: Platform-Dependent Adjustments:
...@@ -115,6 +121,7 @@ configure () ...@@ -115,6 +121,7 @@ configure ()
# Set defaults. # Set defaults.
builddir="$sourcedir/build" builddir="$sourcedir/build"
CMakeCacheEntries="" CMakeCacheEntries=""
append_cache_entry CMAKE_BUILD_TYPE STRING RelWithDebInfo
append_cache_entry CMAKE_INSTALL_PREFIX PATH /usr/local append_cache_entry CMAKE_INSTALL_PREFIX PATH /usr/local
append_cache_entry ENABLE_DEBUG BOOL false append_cache_entry ENABLE_DEBUG BOOL false
append_cache_entry DISABLE_CONTEXT_SWITCHING BOOL false append_cache_entry DISABLE_CONTEXT_SWITCHING BOOL false
...@@ -131,9 +138,6 @@ while [ $# -ne 0 ]; do ...@@ -131,9 +138,6 @@ while [ $# -ne 0 ]; do
echo "${usage}" 1>&2 echo "${usage}" 1>&2
exit 1 exit 1
;; ;;
--builddir=*)
builddir=$optarg
;;
--generator=*) --generator=*)
CMakeGenerator="$optarg" CMakeGenerator="$optarg"
;; ;;
...@@ -155,6 +159,12 @@ while [ $# -ne 0 ]; do ...@@ -155,6 +159,12 @@ while [ $# -ne 0 ]; do
--with-gcc=*) --with-gcc=*)
gcc=$optarg gcc=$optarg
;; ;;
--build-type=*)
append_cache_entry CMAKE_BUILD_TYPE STRING $optarg
;;
--build-dir=*)
builddir=$optarg
;;
--bin-dir=*) --bin-dir=*)
bindir=$optarg bindir=$optarg
;; ;;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment