Merge branch 'ign-cmake2' into cmake-relocatable

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 #============================================================================
 # Initialize the project
 #============================================================================
-project(ignition-cmake2 VERSION 2.6.1)
+project(ignition-cmake2 VERSION 2.6.2)
 
 #--------------------------------------
 # Initialize the IGNITION_CMAKE_DIR variable with the location of the cmake

Changelog.md

@@ -2,26 +2,43 @@
 
 ### Ignition CMake 2.X.X (20XX-XX-XX)
 
+### Ignition CMake 2.6.2 (2020-12-29)
+
+1. FindUUID: Always define UUID::UUID on Apple platforms
+    * [Pull request 128](https://github.com/ignitionrobotics/ign-cmake/pull/128)
+
+1. Remove deprecated doxygen configurations
+    * [Pull request 136](https://github.com/ignitionrobotics/ign-cmake/pull/136)
+
+1. Generate doxygen tutorials for ign-cmake
+    * [Pull request 137](https://github.com/ignitionrobotics/ign-cmake/pull/137)
+
+1. Enable make codecheck for ign-cmake
+    * [Pull request 138](https://github.com/ignitionrobotics/ign-cmake/pull/138)
+
+1. Generate valid visibility macros by replacing hyphens in component name
+    * [Pull request 135](https://github.com/ignitionrobotics/ign-cmake/pull/135)
+
 ### Ignition CMake 2.6.1 (2020-12-10)
 
 1. Revert python to optional dependency
     * [Pull request 132](https://github.com/ignitionrobotics/ign-cmake/pull/132)
 
 ### Ignition CMake 2.6.0 (2020-12-08)
 
-1. Added build-essential and cmake to packages.apt 
+1. Added build-essential and cmake to packages.apt
     * [Pull request 130](https://github.com/ignitionrobotics/ign-cmake/pull/130)
 
 1. Fix FindIgnOgre on Windows when not using vcpkg
     * [Pull request 124](https://github.com/ignitionrobotics/ign-cmake/pull/124)
 
-1. FindIgnOGRE2: prefer versioned component libraries 
+1. FindIgnOGRE2: prefer versioned component libraries
     * [Pull request 125](https://github.com/ignitionrobotics/ign-cmake/pull/125)
 
-1. Correct CMake logic and update cpplint to Python3 
+1. Correct CMake logic and update cpplint to Python3
     * [Pull request 117](https://github.com/ignitionrobotics/ign-cmake/pull/117)
 
-1. Improve fork experience 
+1. Improve fork experience
     * [Pull request 118](https://github.com/ignitionrobotics/ign-cmake/pull/118)
 
 ### Ignition CMake 2.5.0 (2020-09-05)

cmake/IgnUtils.cmake

@@ -663,7 +663,7 @@ function(ign_install_all_headers)
   foreach(dir ${directories})
 
     # GLOB all the header files in dir
-    file(GLOB headers RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${dir}/*.h" "${dir}/*.hh")
+    file(GLOB headers RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${dir}/*.h" "${dir}/*.hh" "${dir}/*.hpp")
     list(SORT headers)
 
     # Remove the excluded headers
@@ -1103,6 +1103,8 @@ function(ign_add_component component_name)
   # Create an upper case version of the component name, to be used as an export
   # base name.
   string(TOUPPER ${component_name} component_name_upper)
+  # hyphen is not supported as macro name, replace it by underscore
+  string(REPLACE "-" "_" component_name_upper ${component_name_upper})
 
   #------------------------------------
   # Create the target for this component, and configure it to be installed
@@ -1349,6 +1351,14 @@ macro(_ign_add_library_or_component)
     _ign_add_library_or_component_arg_error(EXPORT_BASE)
   endif()
 
+  # check that export_base has no invalid symbols
+  string(REPLACE "-" "_" export_base_replaced ${export_base})
+  if(NOT ${export_base} STREQUAL ${export_base_replaced})
+      message(FATAL_ERROR
+        "export_base has a hyphen which is not"
+        "supported by macros used for visibility")
+  endif()
+
   #------------------------------------
   # Create the library target
 

include/ignition/utilities/detail/SuppressWarning.hh

@@ -124,7 +124,8 @@
 #elif defined _MSC_VER
 
   #define DETAIL_IGN_UTILS_WARN_IGNORE__NON_VIRTUAL_DESTRUCTOR \
-    DETAIL_IGN_UTILS_BEGIN_WARNING_SUPPRESSION(4265)
+    DETAIL_IGN_UTILS_BEGIN_WARNING_SUPPRESSION(4265) \
+    DETAIL_IGN_UTILS_BEGIN_WARNING_SUPPRESSION(5205)
 
   #define DETAIL_IGN_UTILS_WARN_RESUME__NON_VIRTUAL_DESTRUCTOR \
     DETAIL_IGN_UTILS_WARN_RESUME