Media
/
media-driver
mirror of https://github.com/intel/media-driver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[CM] A buildfix for the open source build of the media driver 

Reverting the CPP standard used to C++11

Change-Id: Ifbbe52101b1db525a5efc2643bc308e24a9ea392
This commit is contained in:
KonstantinGrebenshchikov 2020-04-24 19:15:36 +08:00 committed by sys_mediadev
parent 3ad7f32265
commit 34815b3d3f
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmrtlib/build_linux.sh
View File

@ -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

10
cmrtlib/linux/CMakeLists.txt
View File

@ -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()