diff --git a/cmrtlib/build_linux.sh b/cmrtlib/build_linux.sh index d28592a71..f3f5fd02a 100644 --- a/cmrtlib/build_linux.sh +++ b/cmrtlib/build_linux.sh @@ -130,7 +130,7 @@ EXTRA_OPTIONS= EXTRA_CMAKE_FLAGS= if [[ $BUILD_EMU -eq 1 ]]; then - EXTRA_CMAKE_FLAGS="$EXTRA_CMAKE_FLAGS -DLIBVA_INSTALL_PATH=$(realpath ../../../../libva-prebuilt-headers)" + EXTRA_CMAKE_FLAGS="$EXTRA_CMAKE_FLAGS -DLATEST_CPP_NEEDED=TRUE -DLIBVA_INSTALL_PATH=$(realpath ../../../../libva-prebuilt-headers)" fi case $BUILD_SIZE in diff --git a/cmrtlib/linux/CMakeLists.txt b/cmrtlib/linux/CMakeLists.txt index 1df08e58c..8efaa8a9b 100644 --- a/cmrtlib/linux/CMakeLists.txt +++ b/cmrtlib/linux/CMakeLists.txt @@ -25,14 +25,20 @@ include (${CMAKE_CURRENT_LIST_DIR}/cmrt_utils.cmake) set(EXECUTABLE_OUTPUT_PATH ${MDF_OPTION__OUTPUT_DIR}) set(LIBRARY_OUTPUT_PATH ${MDF_OPTION__OUTPUT_DIR}) +if (LATEST_CPP_NEEDED) + set(CPP_STANDARD_OPTION -std=c++17) +else() + set(CPP_STANDARD_OPTION -std=c++11) +endif() + # Set up compile options that will be used for the Linux build -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -fPIC -fpermissive -fstack-protector-all -Werror") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -fstack-protector-all -Werror") if(CMAKE_SIZEOF_VOID_P EQUAL 8) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1") endif() set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0") -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c++17 -fPIC -fpermissive -fstack-protector-all -Werror") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -fstack-protector-all -Werror") if(CMAKE_SIZEOF_VOID_P EQUAL 8) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.1") endif()