diff --git a/cmake/compileroptions.cmake b/cmake/compileroptions.cmake index c406c1e84..f5581da9d 100644 --- a/cmake/compileroptions.cmake +++ b/cmake/compileroptions.cmake @@ -109,7 +109,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -Werror") endif() - set(EXTRA_C_FLAGS "-Wall -std=c++0x ${EXTRA_C_FLAGS}") + set(EXTRA_C_FLAGS "-Wall ${EXTRA_C_FLAGS}") set(EXTRA_C_FLAGS_DEBUG "${EXTRA_C_FLAGS_DEBUG} -O0") diff --git a/cmake/printInfo.cmake b/cmake/printInfo.cmake index 6cc345f66..8e3ea18ed 100644 --- a/cmake/printInfo.cmake +++ b/cmake/printInfo.cmake @@ -26,7 +26,11 @@ message( STATUS ) message( STATUS "USE_MATCHCOMPILER = ${USE_MATCHCOMPILER}" ) message( STATUS "USE_MATCHCOMPILER_OPT = ${USE_MATCHCOMPILER_OPT}" ) message( STATUS ) -message( STATUS "BUILD_SHARED_LIBS = ${BUILD_SHARED_LIBS}" ) +if(NOT DEFINED BUILD_SHARED_LIBS) + message( STATUS "BUILD_SHARED_LIBS = OFF" ) +else() + message( STATUS "BUILD_SHARED_LIBS = ${BUILD_SHARED_LIBS}" ) +endif(NOT DEFINED BUILD_SHARED_LIBS) message( STATUS "BUILD_TESTS = ${BUILD_TESTS}" ) message( STATUS "BUILD_GUI = ${BUILD_GUI}" ) message( STATUS "WITH_QCHART = ${WITH_QCHART}" )