From 8eb206c9cccbea9648d15c6a45758e4c5d94b808 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Fri, 22 Nov 2024 22:40:11 +0200 Subject: [PATCH 1/3] Add Linux ARM build configurations and update compile options in CMakeLists.txt --- .appveyor.yml | 12 ++++++------ CMakeLists.txt | 3 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 10e89dc..42f57ca 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -133,6 +133,12 @@ for: environment: matrix: + - job_name: Linux ARM 64-bit + appveyor_build_worker_image: *linux + ARCH: aarch64 + - job_name: Linux ARM 32-bit + appveyor_build_worker_image: *linux + ARCH: armv7l - job_name: Windows x86 64-bit appveyor_build_worker_image: *windows ARCH: x64 @@ -157,12 +163,6 @@ environment: - job_name: Linux x86 32-bit appveyor_build_worker_image: *linux ARCH: i686 - - job_name: Linux ARM 64-bit - appveyor_build_worker_image: *linux - ARCH: aarch64 - - job_name: Linux ARM 32-bit - appveyor_build_worker_image: *linux - ARCH: armv7l deploy: provider: GitHub diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ebb7b2..fd1b4b5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -157,7 +157,8 @@ if(WIN32) ) endif() else() - add_compile_options(-fsigned-char -fstack-protector-strong -fdiagnostics-color) + # add_compile_options(-fsigned-char -fstack-protector-strong -fdiagnostics-color) + target_compile_options(${PROJECT_NAME} PRIVAT -fsigned-char -fstack-protector-strong -fdiagnostics-color) endif() From 2c8ff3e02ed939383e0d55f3224a72a25ef1e264 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Fri, 22 Nov 2024 22:40:31 +0200 Subject: [PATCH 2/3] Fix typo in target_compile_options visibility modifier in CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fd1b4b5..1f04bec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -158,7 +158,7 @@ if(WIN32) endif() else() # add_compile_options(-fsigned-char -fstack-protector-strong -fdiagnostics-color) - target_compile_options(${PROJECT_NAME} PRIVAT -fsigned-char -fstack-protector-strong -fdiagnostics-color) + target_compile_options(${PROJECT_NAME} PRIVATE -fsigned-char -fstack-protector-strong -fdiagnostics-color) endif() From 49b69b683522d65f95a879372498258aec46a871 Mon Sep 17 00:00:00 2001 From: ak5k <42914711+ak5k@users.noreply.github.com> Date: Fri, 22 Nov 2024 22:40:57 +0200 Subject: [PATCH 3/3] Remove commented-out compile options in CMakeLists.txt --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f04bec..1527c5c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -157,7 +157,6 @@ if(WIN32) ) endif() else() - # add_compile_options(-fsigned-char -fstack-protector-strong -fdiagnostics-color) target_compile_options(${PROJECT_NAME} PRIVATE -fsigned-char -fstack-protector-strong -fdiagnostics-color) endif()