1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38
|
From: Gert Wollny <gw.fossdev@gmail.com>
Date: Wed, 29 Jun 2014 16:52:43 +0200
Subject: Do not the user-provided CXX flags
Forwarded: https://github.com/BioPP/bpp-core/pull/29
--- libbpp-core.orig/CMakeLists.txt
+++ libbpp-core/CMakeLists.txt
@@ -9,7 +9,7 @@
project (bpp-core CXX)
# Compile options
-set (CMAKE_CXX_FLAGS "-std=c++11 -Wall -Weffc++ -Wshadow -Wconversion")
+add_compile_options(-std=c++11 -Wall -Weffc++ -Wshadow -Wconversion)
IF(NOT CMAKE_BUILD_TYPE)
SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
--- libbpp-core.orig/cmake/doc-cmake-for-developpers.cmake
+++ libbpp-core/cmake/doc-cmake-for-developpers.cmake
@@ -23,7 +23,7 @@
# - the CMake package
# Do not change it unless there is a good reason...
-set (CMAKE_CXX_FLAGS "std=c++11 -Wall -Weffc++ -Wshadow -Wconversion")
+add_compile_options(std=c++11 -Wall -Weffc++ -Wshadow -Wconversion)
# Define compile options to be used for all C++ targets.
# NOTES for the future:
# -> CMake >= 2.8.12 adds per target COMPILE_OPTIONS by using target_compile_options (<target> [PRIVATE|PUBLIC] <opt1> ... <optN>)
--- libbpp-core.orig/cmake/project-template-for-users.cmake
+++ libbpp-core/cmake/project-template-for-users.cmake
@@ -21,7 +21,7 @@
# Bio++ REQUIRES using at least the C++11 standard.
# This line specifies options passed to the compiler (you can add your own).
-set (CMAKE_CXX_FLAGS "-std=c++11")
+add_compile_options(-std=c++11)
# Tells CMake to create a binary from dummy.cpp (replace with your .cpp file(s))
add_executable (myprogram dummy.cpp other.cpp)
|