renderdoc: need c++14

auto in lambda
This commit is contained in:
Đoàn Trần Công Danh 2022-01-12 19:21:18 +07:00
parent 1e4fd5503b
commit 6b94e7e96a
3 changed files with 19 additions and 8 deletions

View File

@ -3,12 +3,14 @@ so we can use libatomic on targets without atomic8 support
--- a/renderdoc/CMakeLists.txt --- a/renderdoc/CMakeLists.txt
+++ b/renderdoc/CMakeLists.txt +++ b/renderdoc/CMakeLists.txt
@@ -55,6 +55,8 @@ elseif(UNIX) @@ -55,6 +55,10 @@ elseif(UNIX)
PRIVATE -ldl PRIVATE -ldl
PRIVATE -lrt) PRIVATE -lrt)
+#libatomic list(APPEND RDOC_LIBRARIES PRIVATE -latomic) +option(NEED_LIBATOMIC "need libatomic" OFF)
+ +if (NEED_LIBATOMIC)
+list(APPEND RDOC_LIBRARIES PRIVATE -latomic)
+endif()
if(ENABLE_XLIB) if(ENABLE_XLIB)
find_package(X11 REQUIRED) find_package(X11 REQUIRED)

View File

@ -0,0 +1,13 @@
Index: renderdoc-1.12/CMakeLists.txt
===================================================================
--- renderdoc-1.12.orig/CMakeLists.txt
+++ renderdoc-1.12/CMakeLists.txt
@@ -323,7 +323,7 @@ if(cmake_build_type_lower STREQUAL "rele
endif()
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-strict-aliasing")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -fno-strict-aliasing")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
if(ENABLE_GGP)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -gline-tables-only -fno-omit-frame-pointer")

View File

@ -25,15 +25,11 @@ fi
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel" makedepends+=" libatomic-devel"
configure_args+=" -DNEED_LIBATOMIC=ON"
fi fi
nocross="Cross-compilation can't find python3 interpreter" nocross="Cross-compilation can't find python3 interpreter"
post_patch() {
[ -z "$XBPS_TARGET_NO_ATOMIC8" ] && return 0
vsed -i 's,#libatomic , ,' renderdoc/CMakeLists.txt
}
post_install() { post_install() {
vlicense LICENSE.md vlicense LICENSE.md
vlicense docs/credits_acknowledgements.rst vlicense docs/credits_acknowledgements.rst