Update cmake

Author: florianbecker

cmake/external/zlib.cmake

@@ -35,6 +35,7 @@ ExternalProject_Add(ZLIB
   GIT_SHALLOW 1
   CMAKE_ARGS
     -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
+    -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}
     -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
     -DCMAKE_INSTALL_PREFIX:PATH=${ZLIB_INSTALL}
   INSTALL_DIR ${ZLIB_INSTALL}

cmake/sanitizer_options.cmake

@@ -39,7 +39,7 @@ if(SANITIZER_ADDRESS)
     endif()
   endif()
 
-  # gcc needs LD_PRELOAD of libasan and ignore link order
+  # gcc needs ignore link order
   if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     get_property(ALL_TESTS DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY TESTS)
     set_tests_properties(${ALL_TESTS} PROPERTIES ENVIRONMENT ASAN_OPTIONS=verify_asan_link_order=0)