Commit ddcd483af42bef67dea590016a3364f000fa2f08
Committed by
Wiebe Cazemier
1 parent
24a8d11d
Prevent clang warning about "argument unused during compilation"
Showing
2 changed files
with
14 additions
and
7 deletions
CMakeLists.txt
| 1 | cmake_minimum_required(VERSION 3.5) | 1 | cmake_minimum_required(VERSION 3.5) |
| 2 | +include(CheckCXXCompilerFlag) | ||
| 2 | 3 | ||
| 3 | project(FlashMQ LANGUAGES CXX) | 4 | project(FlashMQ LANGUAGES CXX) |
| 4 | 5 | ||
| @@ -7,7 +8,13 @@ add_definitions(-DOPENSSL_API_COMPAT=0x10100000L) | @@ -7,7 +8,13 @@ add_definitions(-DOPENSSL_API_COMPAT=0x10100000L) | ||
| 7 | set(CMAKE_CXX_STANDARD 11) | 8 | set(CMAKE_CXX_STANDARD 11) |
| 8 | set(CMAKE_CXX_STANDARD_REQUIRED ON) | 9 | set(CMAKE_CXX_STANDARD_REQUIRED ON) |
| 9 | 10 | ||
| 10 | -SET(CMAKE_CXX_FLAGS "-rdynamic -msse4.2") | 11 | +SET(CMAKE_CXX_FLAGS "-msse4.2") |
| 12 | + | ||
| 13 | +check_cxx_compiler_flag("-rdynamic" COMPILER_SUPPORTS_RDYNAMIC) | ||
| 14 | +if (${COMPILER_SUPPORTS_RDYNAMIC}) | ||
| 15 | + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -rdynamic") | ||
| 16 | + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -rdynamic") | ||
| 17 | +endif() | ||
| 11 | 18 | ||
| 12 | add_compile_options(-Wall) | 19 | add_compile_options(-Wall) |
| 13 | 20 |
build.sh
| @@ -10,15 +10,15 @@ fi | @@ -10,15 +10,15 @@ fi | ||
| 10 | 10 | ||
| 11 | BUILD_DIR="FlashMQBuild$BUILD_TYPE" | 11 | BUILD_DIR="FlashMQBuild$BUILD_TYPE" |
| 12 | 12 | ||
| 13 | +set -eu | ||
| 14 | + | ||
| 13 | if [[ -e "$BUILD_DIR" ]]; then | 15 | if [[ -e "$BUILD_DIR" ]]; then |
| 14 | - echo "$BUILD_DIR already exists. Not doing anything. You can run 'make' in it, if you want." | ||
| 15 | - exit 1 | 16 | + >&2 echo "$BUILD_DIR already exists. You can run 'make' in it, if you want. |
| 17 | +" | ||
| 18 | +else | ||
| 19 | + mkdir "$BUILD_DIR" | ||
| 16 | fi | 20 | fi |
| 17 | 21 | ||
| 18 | -set -e | ||
| 19 | -set -u | ||
| 20 | - | ||
| 21 | -mkdir "$BUILD_DIR" | ||
| 22 | cd "$BUILD_DIR" | 22 | cd "$BUILD_DIR" |
| 23 | 23 | ||
| 24 | cmake -DCMAKE_BUILD_TYPE="$BUILD_TYPE" "$thisdir" | 24 | cmake -DCMAKE_BUILD_TYPE="$BUILD_TYPE" "$thisdir" |