From 8da7fc9cde8c04757a0a1fc6dfb9323eb1d5a766 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Fri, 14 Nov 2014 14:37:51 +0000 Subject: [PATCH] Init some cmake variables in order to avoid conflits with other systems (e.g., system compiler) --- CMakeLists.txt | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e721b67..44a3181 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,7 @@ SET(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Configs" FORCE) IF(DEFINED CMAKE_BUILD_TYPE AND CMAKE_VERSION VERSION_GREATER "2.8") SET_PROPERTY( CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS ${CMAKE_CONFIGURATION_TYPES} ) ENDIF() +SET( CMAKE_CXX_FLAGS "" ) ###################################################################################### # Variables @@ -57,14 +58,17 @@ IF (NOT CMAKE_BUILD_TYPE) SET(CMAKE_BUILD_TYPE "Release") ENDIF() -SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall" ) -SET( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g" ) -SET( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3" ) - +LIST(APPEND CMAKE_CXX_FLAGS "-Wall" ) IF( PLAYUVER_WERROR ) - SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror" ) + LIST(APPEND CMAKE_CXX_FLAGS "-Werror" ) ENDIF() + + +SET( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g" ) +SET( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2" ) + + ADD_SUBDIRECTORY( lib ) ADD_SUBDIRECTORY( modules ) ADD_SUBDIRECTORY( app )