From 08affc5e9b52ee2ac9ec082057f367f7a25fd829 Mon Sep 17 00:00:00 2001 From: v4hn Date: Wed, 11 Oct 2017 20:34:19 +0200 Subject: [PATCH] set(CMAKE_CXX_FLAGS -> add_compile_options Some of the set commands overwrote user-provided values. Also add_compile_options is the much cleaner interface to add the values --- CMakeLists.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index be227ba..c510ce5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.3) +cmake_minimum_required(VERSION 2.8.12) project(ur_modern_driver) @@ -127,14 +127,16 @@ include(CheckCXXCompilerFlag) CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X) if(COMPILER_SUPPORTS_CXX11) - set(CMAKE_CXX_FLAGS "-std=c++11") + add_compile_options(-std=c++11) elseif(COMPILER_SUPPORTS_CXX0X) - set(CMAKE_CXX_FLAGS "-std=c++0x") + add_compile_options(-std=c++0x) else() message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler. Suggested solution: update the pkg build-essential ") endif() -set(CMAKE_CXX_FLAGS "-g -Wall -Wextra -Wno-unused-parameter ${CMAKE_CXX_FLAGS}") +add_compile_options(-Wall) +add_compile_options(-Wextra) +add_compile_options(-Wno-unused-parameter) ## Specify additional locations of header files ## Your package locations should be listed before other locations