From 9604074789b8ddcb2cc5fdcd578c8f3d46314555 Mon Sep 17 00:00:00 2001 From: navarrop Date: Tue, 28 Jun 2011 12:01:33 +0000 Subject: [PATCH 1/1] Add flag -Wno-error=unused-but-set-variable if gcc >=4.6 git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/contrib/trunk/simgrid-java@9904 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- CMakeLists.txt | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 401e41ef6b..1f8e31b6ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,14 @@ set(CMAKE_EXE_LINKER_FLAGS "" CACHE TYPE INTERNAL FORCE) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/lib") set(soversion 1) +######## +## GCC # +######## +exec_program("${CMAKE_C_COMPILER} --version" OUTPUT_VARIABLE "COMPILER_C_VERSION") +string(REGEX MATCH "[0-9].[0-9].[0-9]" COMPILER_C_VERSION "${COMPILER_C_VERSION}") +string(REGEX MATCH "^[0-9].[0-9]" COMPILER_C_VERSION_MAJOR_MINOR "${COMPILER_C_VERSION}") +string(REPLACE "${COMPILER_C_VERSION_MAJOR_MINOR}." "" COMPILER_C_VERSION_PATCH "${COMPILER_C_VERSION}") + ######## ## SVN # ######## @@ -138,6 +146,11 @@ set(INCLUDE_PATH "-I${CMAKE_HOME_DIRECTORY}/src -I$ENV{SIMGRID_ROOT}/include -I$ set(LIB_PATH "-L$ENV{SIMGRID_ROOT}/lib") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${INCLUDE_PATH} ${LIB_PATH}") +if(COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.6") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=unused-but-set-variable ") +endif(COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.6") + + ########### # TARGETS # ########### -- 2.20.1