Wg fix (#172)

Build fix for iOS

client/cmake/golang.cmake

@@ -5,6 +5,58 @@
 ## Find the absolute path to the go build tool.
 find_program(GOLANG_BUILD_TOOL NAMES go REQUIRED)
 
+## Build a library file from a golang project.
+function(build_go_archive OUTPUT_NAME MODULE_FILE)
+    cmake_parse_arguments(GOBUILD
+        ""
+        "GOOS;GOARCH"
+        "CGO_CFLAGS;CGO_LDFLAGS;SOURCES"
+        ${ARGN})
+
+    string(REGEX REPLACE "\\.[^/]*$" ".h" GOBUILD_HEADER_FILE ${OUTPUT_NAME})
+    get_filename_component(GOBUILD_MODULE_ABS ${MODULE_FILE} ABSOLUTE)
+    get_filename_component(GOBUILD_MODULE_DIR ${GOBUILD_MODULE_ABS} DIRECTORY)
+    set(GOBUILD_ARGS -buildmode=c-archive -trimpath -v)
+    if(IS_DIRECTORY ${GOBUILD_MODULE_DIR}/vendor)
+        list(APPEND GOBUILD_ARGS -mod vendor)
+    endif()
+
+    ## Collect arguments, or find their defaults.
+    if(NOT GOBUILD_CGO_CFLAGS)
+        execute_process(OUTPUT_VARIABLE GOBUILD_CGO_CFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE COMMAND ${GOLANG_BUILD_TOOL} env CGO_CFLAGS)
+        separate_arguments(GOBUILD_CGO_CFLAGS NATIVE_COMMAND ${GOBUILD_CGO_CFLAGS})
+    endif()
+    if(NOT GOBUILD_CGO_LDFLAGS)
+        execute_process(OUTPUT_VARIABLE GOBUILD_CGO_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE COMMAND ${GOLANG_BUILD_TOOL} env CGO_LDFLAGS)
+        separate_arguments(GOBUILD_CGO_LDFLAGS NATIVE_COMMAND ${GOBUILD_CGO_LDFLAGS})
+    endif()
+    if(NOT GOBUILD_GOOS)
+        execute_process(OUTPUT_VARIABLE GOBUILD_GOOS OUTPUT_STRIP_TRAILING_WHITESPACE COMMAND ${GOLANG_BUILD_TOOL} env GOOS)
+    endif()
+    if(NOT GOBUILD_GOARCH)
+        execute_process(OUTPUT_VARIABLE GOBUILD_GOARCH OUTPUT_STRIP_TRAILING_WHITESPACE COMMAND ${GOLANG_BUILD_TOOL} env GOARCH)
+    endif()
+
+    ## Use a go-cache isolated to our project
+    set(GOCACHE ${CMAKE_BINARY_DIR}/go-cache)
+    set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_BINARY_DIR}/go-cache)
+
+    ## The command that does the building
+    get_filename_component(ABS_OUTPUT_NAME ${OUTPUT_NAME} ABSOLUTE)
+    add_custom_command(
+        OUTPUT ${OUTPUT_NAME} ${GOBUILD_HEADER_FILE}
+        DEPENDS ${MODULE_FILE} ${GOBUILD_SOURCES}
+        WORKING_DIRECTORY ${GOBUILD_MODULE_DIR}
+        COMMAND ${CMAKE_COMMAND} -E env GOCACHE=${GOCACHE}
+                    CGO_ENABLED=1
+                    CGO_CFLAGS="${GOBUILD_CGO_CFLAGS}"
+                    CGO_LDFLAGS="${GOBUILD_CGO_LDFLAGS}"
+                    GOOS=${GOBUILD_GOOS}
+                    GOARCH=${GOBUILD_GOARCH}
+                ${GOLANG_BUILD_TOOL} build ${GOBUILD_ARGS} -o ${ABS_OUTPUT_NAME}
+    )
+endfunction(build_go_archive)
+
 ## Create a library target built from a golang c-archive.
 function(add_go_library GOTARGET SOURCE)
     cmake_parse_arguments(GOLANG

client/cmake/ios-arch-fixup.cmake

@@ -0,0 +1,43 @@
+if(NOT XCODE)
+    return()
+endif()
+
+## Enumerate all the targets in the project
+get_directory_property(IOS_SUBDIRS SUBDIRECTORIES)
+get_directory_property(IOS_TARGETS BUILDSYSTEM_TARGETS)
+while(IOS_SUBDIRS)
+    list(POP_FRONT IOS_SUBDIRS SUBDIR)
+
+    get_directory_property(SUBDIR_TARGETS DIRECTORY ${SUBDIR} BUILDSYSTEM_TARGETS)
+    list(APPEND IOS_TARGETS ${SUBDIR_TARGETS})
+
+    get_directory_property(SUBDIR_NESTED DIRECTORY ${SUBDIR} SUBDIRECTORIES)
+    list(APPEND IOS_SUBDIRS ${SUBDIR_NESTED})
+endwhile()
+
+## The set of target types that we want to modify.
+set(IOS_TARGET_COMPILED_TYPES
+    STATIC_LIBRARY
+    MODULE_LIBRARY
+    SHARED_LIBRARY
+    OBJECT_LIBRARY
+    EXECUTABLE
+)
+
+## Inspect all the targets, and add extra properties if necessary.
+while(IOS_TARGETS)
+    list(POP_FRONT IOS_TARGETS TARGET_NAME)
+
+    get_target_property(TARGET_TYPE ${TARGET_NAME} TYPE)
+    list(FIND IOS_TARGET_COMPILED_TYPES ${TARGET_TYPE} IOS_TARGET_TYPE_INDEX)
+    if(IOS_TARGET_TYPE_INDEX LESS 0)
+        continue()
+    endif()
+
+    ## I just want to say it's amazing this doesn't explode with syntax errors.
+    message("Patching architectures for ${TARGET_NAME}")
+    set_target_properties(${TARGET_NAME} PROPERTIES
+        XCODE_ATTRIBUTE_ARCHS[sdk=iphoneos*] "arm64"
+        XCODE_ATTRIBUTE_ARCHS[sdk=iphonesimulator*] "x86_64"
+    )
+endwhile()