Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git

# Conflicts: # .gitignore
mixxxdj · May 25, 2021 · f452c21 · f452c21
2 parents 2cb9421 + 0a5d1f7
commit f452c21
Show file tree

Hide file tree

Showing 142 changed files with 13,363 additions and 22,263 deletions.
diff --git a/.gitignore b/.gitignore
@@ -29,6 +29,15 @@ compile_commands.json
 /build
 /install
 
+# Exclude unneeded files from GoogleTest library when updating our bundled
+# GoogleTest library in the lib/ directory
+lib/googletest/docs
+lib/googletest/ci
+lib/googletest/.github
+lib/googletest/googlemock/test
+lib/googletest/googletest/samples
+lib/googletest/googletest/test
+
 # Legacy compilation artifacts that are obsolete starting with 2.3
 # TODO: Delete after 2.2 with SCons has been abandoned. Developers
 # are supposed to clean their project directory!

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1408,8 +1408,8 @@ set(INSTALL_GTEST OFF CACHE BOOL "Disable installation of GoogleTest" FORCE)
 # Add googletest directly to our build. This adds the following targets:
 # gtest, gtest_main, gmock and gmock_main
 add_subdirectory(
-  "${CMAKE_CURRENT_SOURCE_DIR}/lib/googletest-1.10.x"
-  "${CMAKE_CURRENT_BINARY_DIR}/lib/googletest-1.10.x"
+  "${CMAKE_CURRENT_SOURCE_DIR}/lib/googletest"
+  "${CMAKE_CURRENT_BINARY_DIR}/lib/googletest"
 )
 
 add_executable(mixxx-test

diff --git a/lib/googletest-1.10.x/README.md b/lib/googletest-1.10.x/README.md
diff --git a/lib/googletest-1.10.x/WORKSPACE b/lib/googletest-1.10.x/WORKSPACE
diff --git a/lib/googletest-1.10.x/appveyor.yml b/lib/googletest-1.10.x/appveyor.yml
diff --git a/lib/googletest-1.10.x/googlemock/CONTRIBUTORS b/lib/googletest-1.10.x/googlemock/CONTRIBUTORS