Merge branch 'main' into otore/animation_name

Author: mjcarroll

.github/workflows/macos.yml

@@ -5,7 +5,7 @@ on: [push, pull_request]
 jobs:
   build:
     env:
-      PACKAGE: gz-common5
+      PACKAGE: gz-common6
     runs-on: macos-latest
     steps:
     - uses: actions/checkout@v2

BUILD.bazel

@@ -19,7 +19,7 @@ exports_files(["LICENSE"])
 
 PROJECT_NAME = "gz-common"
 
-PROJECT_MAJOR = 5
+PROJECT_MAJOR = 6
 
 PROJECT_MINOR = 0
 
@@ -84,9 +84,9 @@ cc_library(
 )
 
 cc_binary(
-    name = "libgz-common5.so",
+    name = "libgz-common6.so",
     includes = ["include"],
-    linkopts = ["-Wl,-soname,libgz-common5.so"],
+    linkopts = ["-Wl,-soname,libgz-common6.so"],
     linkshared = True,
     deps = [":gz_common"],
 )
@@ -99,7 +99,7 @@ test_srcs = glob(
 [cc_test(
     name = src.replace("/", "_").replace(".cc", "").replace("src_", ""),
     srcs = [src],
-    data = [":libgz-common5.so"],
+    data = [":libgz-common6.so"],
     deps = [
         ":gz_common",
         GZ_ROOT + "gz_bazel:utilities",

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 #============================================================================
 # Initialize the project
 #============================================================================
-project(gz-common5 VERSION 5.0.0)
+project(gz-common6 VERSION 6.0.0)
 set(GZ_COMMON_VER ${PROJECT_VERSION_MAJOR})
 
 #============================================================================
@@ -18,7 +18,7 @@ set(GZ_CMAKE_VER ${gz-cmake3_VERSION_MAJOR})
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-gz_configure_project(VERSION_SUFFIX pre1)
+gz_configure_project(VERSION_SUFFIX)
 
 #============================================================================
 # Set project-specific options
@@ -67,11 +67,6 @@ else()
   message(STATUS "Skipping search for tinyxml2 and using an internal version\n")
 endif()
 
-#--------------------------------------
-# Find libdl
-gz_find_package(
-  DL REQUIRED PRIVATE PRETTY libdl PURPOSE "Required for plugins")
-
 #--------------------------------------
 # Find dependencies that we ignore for Visual Studio
 if(NOT MSVC)
@@ -109,6 +104,7 @@ gz_find_package(SWSCALE REQUIRED_BY av PRETTY libswscale)
 #------------------------------------
 # Find avdevice
 gz_find_package(AVDEVICE VERSION 56.4.100 REQUIRED_BY av PRETTY libavdevice)
+set(HAVE_AVDEVICE ${AVDEVICE_FOUND})
 
 #------------------------------------
 # Find avformat
@@ -126,7 +122,6 @@ gz_find_package(AVUTIL REQUIRED_BY av PRETTY libavutil)
 # Find assimp
 gz_find_package(GzAssimp REQUIRED_BY graphics PRETTY assimp)
 
-
 message(STATUS "-------------------------------------------\n")
 
 
@@ -137,7 +132,7 @@ configure_file("${PROJECT_SOURCE_DIR}/cppcheck.suppress.in"
                ${PROJECT_BINARY_DIR}/cppcheck.suppress)
 
 gz_configure_build(QUIT_IF_BUILD_ERRORS
-  COMPONENTS av events geospatial graphics profiler testing)
+  COMPONENTS av events geospatial graphics io profiler testing)
 
 #============================================================================
 # Create package information