Fixed CXX flags to use C++11 standard

WITH_STATIC is always defaulted to ON for the time being
This commit is contained in:
gmt2001
2013-03-31 11:23:16 -04:00
parent d61f8845da
commit e24d563729
2 changed files with 3 additions and 5 deletions

View File

@@ -25,11 +25,7 @@ OPTION(WITH_BLACK_LIB "Build BlackBox libraries"
IF(WITH_BLACK_LIB) IF(WITH_BLACK_LIB)
OPTION(WITH_BLACK_CORE "Build Core library" ON ) OPTION(WITH_BLACK_CORE "Build Core library" ON )
OPTION(WITH_BLACK_MISC "Build Misc library" ON ) OPTION(WITH_BLACK_MISC "Build Misc library" ON )
IF(WIN32)
OPTION(WITH_STATIC "With static libraries." ON ) OPTION(WITH_STATIC "With static libraries." ON )
ELSE(WIN32)
OPTION(WITH_STATIC "With static libraries." OFF)
ENDIF()
OPTION(WITH_BLACK_SAMPLES "With BlackLib Samples." ON) OPTION(WITH_BLACK_SAMPLES "With BlackLib Samples." ON)
ENDIF(WITH_BLACK_LIB) ENDIF(WITH_BLACK_LIB)

View File

@@ -3,6 +3,8 @@ FILE(GLOB blackcore_HEADERS *.h)
SET(blackcore_HEADERS_QOBJECT SET(blackcore_HEADERS_QOBJECT
fsd_client.h) fsd_client.h)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
QT4_WRAP_CPP(blackcore_HEADERS_MOC ${blackcore_HEADERS_QOBJECT}) QT4_WRAP_CPP(blackcore_HEADERS_MOC ${blackcore_HEADERS_QOBJECT})
SOURCE_GROUP(QtGeneratedMocSrc FILES ${blackcore_HEADERS_MOC}) SOURCE_GROUP(QtGeneratedMocSrc FILES ${blackcore_HEADERS_MOC})