xcode

.github/workflows/macos.yml

@@ -15,7 +15,7 @@ jobs:
       matrix:
         std: [14, 17, 20, 23]
         include:
-          - generator: Ninja
+          - generator: Xcode
           - build_type: Debug
 
     steps:
@@ -34,6 +34,7 @@ jobs:
         if: matrix.build_type == 'Debug'
         run: |
           echo 'CXXFLAGS=--coverage' >> $GITHUB_ENV
+          echo 'LDFLAGS=--coverage' >> $GITHUB_ENV
 
       - name: Configure
         shell: bash
@@ -55,6 +56,7 @@ jobs:
       - name: Test
         run: |
           ctest --test-dir build_${{matrix.build_type}} \
+                --build-config ${{matrix.build_type}} \
                 --output-on-failure
 
       - name: Generate Coverage

CMakeLists.txt

@@ -612,18 +612,7 @@ if (NOT WITH_FUZZING STREQUAL "none")
 endif (NOT WITH_FUZZING STREQUAL "none")
 
 if (BUILD_TESTING)
-  add_library (glogtest STATIC
-    $<TARGET_OBJECTS:glog_internal>
-  )
-
-  target_include_directories (glogtest PUBLIC
-    $<TARGET_PROPERTY:glog,INCLUDE_DIRECTORIES>)
-  target_compile_definitions (glogtest PUBLIC
-    $<TARGET_PROPERTY:glog,COMPILE_DEFINITIONS> GLOG_STATIC_DEFINE)
-  target_link_libraries (glogtest PUBLIC
-    $<TARGET_PROPERTY:glog,LINK_LIBRARIES>)
-
-  set (_GLOG_TEST_LIBS glogtest)
+  set (_GLOG_TEST_LIBS glog_internal $<TARGET_PROPERTY:glog,LINK_LIBRARIES>)
 
   if (HAVE_LIB_GTEST)
     list (APPEND _GLOG_TEST_LIBS GTest::gtest)

src/base/commandlineflags.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2008, Google Inc.
+// Copyright (c) 2023, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without