fix jpeg on arm

Author: malytomas

.github/workflows/tests.yml

@@ -66,15 +66,16 @@ jobs:
 
 
   Ubuntu:
-    name: ubuntu-${{ matrix.os-version }}-${{ matrix.build-config }}-${{ matrix.compiler.cc }}
-    runs-on: ubuntu-${{ matrix.os-version }}
+    name: ubuntu-${{ matrix.os-version }}${{ matrix.cpu-arch }}-${{ matrix.build-config }}-${{ matrix.compiler.cc }}
+    runs-on: ubuntu-${{ matrix.os-version }}.04
     env:
       CC: ${{ matrix.compiler.cc }}
       CXX: ${{ matrix.compiler.cxx }}
     strategy:
       fail-fast: false
       matrix:
-        os-version: [22.04, 24.04, 24.04-arm]
+        os-version: [22, 24]
+        cpu-arch: ["", "-arm"]
         build-config: [debug, release]
         compiler:
         - {
@@ -98,16 +99,16 @@ jobs:
             install: clang-18
           }
         exclude:
-        - os-version: 24.04
+        - os-version: 24
           compiler:
             cc: gcc-12
-        - os-version: 22.04
+        - os-version: 22
           compiler:
             cc: gcc-13
-        - os-version: 24.04
+        - os-version: 24
           compiler:
             cc: clang-15
-        - os-version: 22.04
+        - os-version: 22
           compiler:
             cc: clang-18
 

externals/jpeg/CMakeLists.txt

@@ -6,7 +6,7 @@ message(STATUS "----------------------------------------------------------------
 
 include_directories("${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/jpeg")
 
-if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+if(CMAKE_C_COMPILER_TARGET MATCHES "x86_64" AND CMAKE_SIZEOF_VOID_P EQUAL 8)
 	if(WIN32)
 		set(CMAKE_ASM_NASM_COMPILER "${CMAKE_CURRENT_SOURCE_DIR}/yasm/win64/bin/yasm.exe" CACHE INTERNAL "" FORCE)
 		set(CMAKE_ASM_NASM_FLAGS "${CMAKE_ASM_NASM_FLAGS} -DWIN64 -D__x86_64__ -D\"EXTN(name)=name\"") # target_compile_definitions does not work with nasm