From a820d9195e8c2bb422274827083a503fadc4f9dd Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Fri, 14 Nov 2014 14:44:23 +0000 Subject: [PATCH] Revert last commit --- CMakeLists.txt | 7 ++----- cmake/LibQT.cmake | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 44a3181..75a4a1f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,17 +58,14 @@ IF (NOT CMAKE_BUILD_TYPE) SET(CMAKE_BUILD_TYPE "Release") ENDIF() -LIST(APPEND CMAKE_CXX_FLAGS "-Wall" ) +SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall" ) IF( PLAYUVER_WERROR ) - LIST(APPEND CMAKE_CXX_FLAGS "-Werror" ) + SET( CMAKE_CXX_FLAGS "${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 ) diff --git a/cmake/LibQT.cmake b/cmake/LibQT.cmake index 5b11e8d..a0b2ae8 100644 --- a/cmake/LibQT.cmake +++ b/cmake/LibQT.cmake @@ -27,7 +27,7 @@ IF( NOT USE_QT4 ) FIND_PACKAGE( Qt5Widgets REQUIRED ) INCLUDE_DIRECTORIES( ${Qt5Core_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ) # Add compiler flags for building executables (-fPIE) - LIST(APPEND CMAKE_CXX_FLAGS ${Qt5Core_EXECUTABLE_COMPILE_FLAGS} ) + SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}" ) LIST(APPEND LINKER_LIBS ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Widgets_LIBRARIES} ) LIST(APPEND QT_MODULES Core Gui Widgets ) IF( WIN32 )