Date: Wed, 25 Feb 2015 19:52:43 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379960 - head/graphics/code-eli/files Message-ID: <201502251952.t1PJqhoU096208@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Wed Feb 25 19:52:43 2015 New Revision: 379960 URL: https://svnweb.freebsd.org/changeset/ports/379960 QAT: https://qat.redports.org/buildarchive/r379960/ Log: graphics/code-eli: Respect CFLAGS and CXXFLAGS (PHB 12.9) Tested on gcc-5 (DragonFly) and clang-3.3 (FreeBSD 10) Approved by: blanket Added: head/graphics/code-eli/files/ head/graphics/code-eli/files/patch-cmake_ConfigureCompiler.cmake (contents, props changed) Added: head/graphics/code-eli/files/patch-cmake_ConfigureCompiler.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/code-eli/files/patch-cmake_ConfigureCompiler.cmake Wed Feb 25 19:52:43 2015 (r379960) @@ -0,0 +1,41 @@ +--- cmake/ConfigureCompiler.cmake.orig 2014-08-17 07:02:14 UTC ++++ cmake/ConfigureCompiler.cmake +@@ -135,7 +135,7 @@ if(NOT CONFIGURE_COMPILER_INCLUDED) + # set GNU Compiler Collection flags + if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + set(CONFIGURE_COMPILER_SET_C_COMPILER_FLAGS ON) +- set(CMAKE_C_FLAGS "-pedantic -Wall -Wextra -fmessage-length=100 -std=c99" ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic -Wall -Wextra -fmessage-length=100 -std=c99" + CACHE STRING "Flags used by the compiler during all build types." FORCE) + set(CMAKE_C_FLAGS_DEBUG "-DDEBUG -O0 -g" + CACHE STRING "Flags used by the compiler during debug builds." FORCE) +@@ -152,9 +152,9 @@ if(NOT CONFIGURE_COMPILER_INCLUDED) + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + set(CONFIGURE_COMPILER_SET_CXX_COMPILER_FLAGS ON) + if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7") +- set(CMAKE_CXX_FLAGS "-std=c++0x") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") + else() +- set(CMAKE_CXX_FLAGS "-std=c++11") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + endif() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Wno-long-long -fmessage-length=100" + CACHE STRING "Flags used by the compiler during all build types." FORCE) +@@ -189,7 +189,7 @@ if(NOT CONFIGURE_COMPILER_INCLUDED) + set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_INHIBIT_ALL_WARNINGS "YES") + set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_PEDANTIC "YES") + else() +- set(CMAKE_C_FLAGS "-pedantic -Wall -Wextra -fmessage-length=100 -std=c99" ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic -Wall -Wextra -fmessage-length=100 -std=c99" + CACHE STRING "Flags used by the compiler during all build types." FORCE) + endif() + set(CMAKE_C_FLAGS_DEBUG "-DDEBUG -O0 -g" +@@ -212,7 +212,7 @@ if(NOT CONFIGURE_COMPILER_INCLUDED) + set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_INHIBIT_ALL_WARNINGS "YES") + set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_PEDANTIC "YES") + else() +- set(CMAKE_CXX_FLAGS "-pedantic -Wall -Wextra -Wno-long-long -fmessage-length=100 -std=c++11 -stdlib=libc++" ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Wno-long-long -fmessage-length=100 -std=c++11 -stdlib=libc++" + CACHE STRING "Flags used by the compiler during all build types." FORCE) + endif() + set(CMAKE_CXX_FLAGS_DEBUG "-DDEBUG -O0 -g"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502251952.t1PJqhoU096208>