Revert last commit
This commit is contained in:
1 parent
8da7fc9cde
commit
a820d9195e
2 files changed
+3
-6
No files matched your search
+2
-5
@@ -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 )
|
||||
|
||||
+1
-1
@@ -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 )
|
||||
|
||||
Reference in new issue
Block a user