diff --git a/CMakeLists.txt b/CMakeLists.txt index 24befc5..872ddc7 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,6 +39,8 @@ 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 ###################################################################################### @@ -87,11 +89,14 @@ ENDIF() SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall" ) SET( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g" ) -SET( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3" ) +SET( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3" ) + IF( USE_WERROR ) SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror" ) ENDIF() +SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" ) + ADD_EXECUTABLE( ${PROJECT_NAME} ${SOURCES_FILES} ${HEADERS_MOC_FILES} ${FORMS_HEADERS_FILES} ${RESOURCES_RCC_FILES} ) TARGET_LINK_LIBRARIES( ${PROJECT_NAME} ${PLAYUVER_LIBS} ${MODULES_LIBS} ${LINKER_LIBS} ) @@ -107,7 +112,7 @@ INCLUDE(cmake/Install.cmake) ###################################################################################### status("Configuration:") status(" Build type:" ${CMAKE_BUILD_TYPE} ) -status(" Build flags:" ${CMAKE_CXX_FLAGS} ) +status(" Build flags:" "${CMAKE_CXX_FLAGS}" ) status(" Warnings as errors:" USE_WERROR THEN YES ELSE NO) status("Dependencies:") status(" QT:" USE_QT4 THEN "QT4" ELSE "QT5" ) diff --git a/cmake/LibQT.cmake b/cmake/LibQT.cmake index 739cb22..8de8f11 100644 --- a/cmake/LibQT.cmake +++ b/cmake/LibQT.cmake @@ -32,7 +32,7 @@ IF( NOT USE_QT4 ) QT5_ADD_RESOURCES( RESOURCES_RCC_FILES ${RESOURCES_FILES} ) # Add compiler flags for building executables (-fPIE) - SET( CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS} ) + LIST(APPEND CMAKE_CXX_FLAGS ${Qt5Core_EXECUTABLE_COMPILE_FLAGS} ) LIST(APPEND LINKER_LIBS ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Widgets_LIBRARIES} ) SET( CURR_QT_MODULES Core Gui Widgets )