fix(cmake): fix go-worker cmake to fetch gpgme from correct folder on…

… arm64.

Signed-off-by: Federico Di Pierro <[email protected]>

CMakeLists.txt

@@ -6,6 +6,9 @@ endif()
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
 
+# From now on, we have VCPKG_ARCH variable
+include(arch)
+
 # compiler related configs
 include(compiler)
 

cmake/modules/arch.cmake

@@ -0,0 +1,18 @@
+execute_process(
+        COMMAND uname -m
+        COMMAND sed "s/x86_64/x64/"
+        COMMAND sed "s/aarch64/arm64/"
+        OUTPUT_VARIABLE ARCH_output
+        ERROR_VARIABLE ARCH_error
+        RESULT_VARIABLE ARCH_result
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+if(${ARCH_result} EQUAL 0)
+    set(VCPKG_ARCH ${ARCH_output})
+    message(STATUS "Target arch: ${VCPKG_ARCH}")
+else()
+    message(
+            FATAL_ERROR
+            "Failed to determine target architecture: ${ARCH_error}"
+    )
+endif()

cmake/modules/go-worker.cmake

@@ -9,7 +9,7 @@ pkg_check_modules(GPGME REQUIRED gpgme IMPORTED_TARGET)
 
 # Pkg config paths to all gpgme libs (libgpgme, libgpg-error and libassuan)
 # to be passed down to go-worker to let it find the needed deps.
-set(VCPKG_PKGCONFIG_PATH "${CMAKE_SOURCE_DIR}/vcpkg/packages/gpgme_x64-linux-release/lib/pkgconfig/:${CMAKE_SOURCE_DIR}/vcpkg/packages/libgpg-error_x64-linux-release/lib/pkgconfig/:${CMAKE_SOURCE_DIR}/vcpkg/packages/libassuan_x64-linux-release/lib/pkgconfig/")
+set(VCPKG_PKGCONFIG_PATH "${CMAKE_SOURCE_DIR}/vcpkg/packages/gpgme_${VCPKG_ARCH}-linux-release/lib/pkgconfig/:${CMAE_SOURCE_DIR}/vcpkg/packages/libgpg-error_${VCPKG_ARCH}-linux-release/lib/pkgconfig/:${CMAKE_SOURCE_DIR}/vcpkg/packages/libassuan_${VCPKG_ARCH}-linux-release/lib/pkgconfig/")
 
 ExternalProject_Add(go-worker
         DEPENDS PkgConfig::GPGME

cmake/modules/vcpkg.cmake

@@ -1,21 +1,2 @@
-execute_process(
-        COMMAND uname -m
-        COMMAND sed "s/x86_64/x64/"
-        COMMAND sed "s/aarch64/arm64/"
-        OUTPUT_VARIABLE ARCH_output
-        ERROR_VARIABLE ARCH_error
-        RESULT_VARIABLE ARCH_result
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-if(${ARCH_result} EQUAL 0)
-    set(ARCH ${ARCH_output})
-    message(STATUS "Target arch: ${ARCH}")
-else()
-    message(
-            FATAL_ERROR
-            "Failed to determine target architecture: ${ARCH_error}"
-    )
-endif()
-
-set(VCPKG_TARGET_TRIPLET "${ARCH}-linux-release")
+set(VCPKG_TARGET_TRIPLET "${VCPKG_ARCH}-linux-release")
 set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake CACHE STRING "Vcpkg toolchain file")