From e24d563729261c6f608bcecdb89843c1516b7309 Mon Sep 17 00:00:00 2001 From: gmt2001 Date: Sun, 31 Mar 2013 11:23:16 -0400 Subject: [PATCH] Fixed CXX flags to use C++11 standard WITH_STATIC is always defaulted to ON for the time being --- CMakeLists.txt | 6 +----- src/blackcore/CMakeLists.txt | 2 ++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d483f9227..6ceae58d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,11 +25,7 @@ OPTION(WITH_BLACK_LIB "Build BlackBox libraries" IF(WITH_BLACK_LIB) OPTION(WITH_BLACK_CORE "Build Core library" ON ) OPTION(WITH_BLACK_MISC "Build Misc library" ON ) - IF(WIN32) - OPTION(WITH_STATIC "With static libraries." ON ) - ELSE(WIN32) - OPTION(WITH_STATIC "With static libraries." OFF) - ENDIF() + OPTION(WITH_STATIC "With static libraries." ON ) OPTION(WITH_BLACK_SAMPLES "With BlackLib Samples." ON) ENDIF(WITH_BLACK_LIB) diff --git a/src/blackcore/CMakeLists.txt b/src/blackcore/CMakeLists.txt index 13c37653c..2a5762087 100644 --- a/src/blackcore/CMakeLists.txt +++ b/src/blackcore/CMakeLists.txt @@ -2,6 +2,8 @@ FILE(GLOB blackcore_SOURCES *.cpp) FILE(GLOB blackcore_HEADERS *.h) SET(blackcore_HEADERS_QOBJECT fsd_client.h) + +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") QT4_WRAP_CPP(blackcore_HEADERS_MOC ${blackcore_HEADERS_QOBJECT})