Skip to content

Commit 4de9c07

Browse files
authored
Merge pull request #75 from thewtex/aarch-string
Aarch string
2 parents 0077534 + 974e40b commit 4de9c07

File tree

3 files changed

+5
-13
lines changed

3 files changed

+5
-13
lines changed

.github/workflows/main.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ jobs:
2121
matrix:
2222
# Disable: unsupported system: android-arm, android-arm64, android-x86, android-x86_64, web-wasm,
2323
# Disable: missing header in linux(GCC): windows-static-x64, windows-static-x64-posix, windows-static-x86, windows-shared-x64, windows-shared-x64-posix, windows-shared-x86,
24-
arch_name: [linux-arm64, linux-arm64-musl, linux-armv5, linux-armv5-musl, linux-armv6, linux-armv6-musl, linux-armv7, linux-armv7a, linux-armv7l-musl, linux-x64-clang, linux-s390x, linux-x64, linux-x86, linux-mips, linux-ppc64le, manylinux1-x64, manylinux1-x86, manylinux2010-x64, manylinux2010-x86, manylinux2014-x64, manylinux2014-x86, manylinux2014-aarch64, linux-riscv64, linux-riscv32]
24+
# Disable: string-related vtable linker error: manylinux2014-aarch64
25+
arch_name: [linux-arm64, linux-arm64-musl, linux-armv5, linux-armv5-musl, linux-armv6, linux-armv6-musl, linux-armv7, linux-armv7a, linux-armv7l-musl, linux-x64-clang, linux-s390x, linux-x64, linux-x86, linux-mips, linux-ppc64le, manylinux1-x64, manylinux1-x86, manylinux2010-x64, manylinux2010-x86, manylinux2014-x64, manylinux2014-x86, linux-riscv64, linux-riscv32]
2526
build_type: [Release, Debug]
2627
steps:
2728
- name: "📥 Checkout Code"

CMakeLists.txt

+2-12
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,8 @@ set(tmux-mem-cpu-load_VERSION
2828
${tmux-mem-cpu-load_VERSION_MAJOR}.${tmux-mem-cpu-load_VERSION_MINOR}.${tmux-mem-cpu-load_VERSION_PATCH})
2929

3030
# Check whether we have support for c++11 in compiler and fail if we don't
31-
include(CheckCXXCompilerFlag)
32-
check_cxx_compiler_flag("-std=c++11" COMPILER_SUPPORTS_CXX11)
33-
check_cxx_compiler_flag("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
34-
35-
if(COMPILER_SUPPORTS_CXX11)
36-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
37-
elseif(COMPILER_SUPPORTS_CXX0X)
38-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
39-
else()
40-
message(FATAL_ERROR
41-
"Compiler ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION} has no C++11 support.")
42-
endif()
31+
set(CMAKE_CXX_STANDARD 11)
32+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
4333

4434
# generate header file to handle version
4535
configure_file(

common/memory.cc

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
*/
1818

1919
#include <sstream>
20+
#include <string>
2021

2122
#include "memory.h"
2223
#include "luts.h"

0 commit comments

Comments
 (0)