diff --git a/CMakeLists.txt b/CMakeLists.txt index 29fb7bd0..793af7bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -168,12 +168,6 @@ install( message(STATUS "Install prefix: ${CMAKE_INSTALL_PREFIX}") -# TODO(CH3): Deprecated. Remove on tock. -# Install symlinks for IgnPython and IgnBenchmark -set(tick_tocked_cmake_files - "GzPython.cmake" - "GzBenchmark.cmake") - include(CTest) if (BUILD_TESTING) add_subdirectory(test) diff --git a/cmake/FindGzBullet.cmake b/cmake/FindGzBullet.cmake index 798d2395..70f7a763 100644 --- a/cmake/FindGzBullet.cmake +++ b/cmake/FindGzBullet.cmake @@ -44,5 +44,3 @@ if(BULLET_FOUND) INCLUDE_VAR BULLET_INCLUDE_DIRS ) endif() - -set(IgnBullet_FOUND ${GzBullet_FOUND}) # TODO(CH3): Deprecated. Remove on tock. diff --git a/cmake/FindGzCURL.cmake b/cmake/FindGzCURL.cmake index 90c1f2e2..c20783d4 100644 --- a/cmake/FindGzCURL.cmake +++ b/cmake/FindGzCURL.cmake @@ -37,7 +37,6 @@ endif() find_package(CURL ${GzCURL_FIND_VERSION} ${gz_quiet_arg}) set(GzCURL_FOUND ${CURL_FOUND}) -set(IgnCURL_FOUND ${GzCURL_FOUND}) # TODO(CH3): Deprecated. Remove on tock. if(${GzCURL_FOUND}) @@ -45,11 +44,6 @@ if(${GzCURL_FOUND}) set(GzCURL_LIBRARIES ${CURL_LIBRARIES}) set(GzCURL_VERSION ${CURL_VERSION_STRING}) - # TODO(CH3): Deprecated. Remove on tock. - set(IgnCURL_INCLUDE_DIRS ${GzCURL_INCLUDE_DIRS}) - set(IgnCURL_LIBRARIES ${GzCURL_LIBRARIES}) - set(IgnCURL_VERSION ${GzCURL_VERSION}) - # Older versions of curl don't create imported targets, so we will create # them here if they have not been provided. if(TARGET CURL::libcurl AND NOT TARGET curl::curl) diff --git a/cmake/FindGzOGRE.cmake b/cmake/FindGzOGRE.cmake index 5b458cec..60b46124 100644 --- a/cmake/FindGzOGRE.cmake +++ b/cmake/FindGzOGRE.cmake @@ -258,5 +258,3 @@ if(OGRE_FOUND) LIB_VAR OGRE_LIBRARIES INCLUDE_VAR OGRE_INCLUDE_DIRS) endif() - -set(IgnOGRE_FOUND ${GzOGRE_FOUND}) # TODO(CH3): Deprecated. Remove on tock. diff --git a/cmake/FindGzProtobuf.cmake b/cmake/FindGzProtobuf.cmake index 1664f00b..bd707f40 100644 --- a/cmake/FindGzProtobuf.cmake +++ b/cmake/FindGzProtobuf.cmake @@ -78,7 +78,6 @@ if(${Protobuf_FOUND}) # If we have found Protobuf, then set the GzProtobuf_FOUND flag to true so # that gz_find_package(~) knows that we were successful. set(GzProtobuf_FOUND true) - set(IgnProtobuf_FOUND true) # TODO(CH3): Deprecated. Remove on tock. # Older versions of protobuf don't create imported targets, so we will create # them here if they have not been provided. diff --git a/cmake/FindGzURDFDOM.cmake b/cmake/FindGzURDFDOM.cmake index c6fe13f1..e33ee38d 100644 --- a/cmake/FindGzURDFDOM.cmake +++ b/cmake/FindGzURDFDOM.cmake @@ -50,5 +50,3 @@ if(NOT GzURDFDOM_FOUND) find_package_handle_standard_args(GzURDFDOM DEFAULT_MSG) endif() endif() - -set(IgnURDFDOM_FOUND ${GzURDFDOM_FOUND}) # TODO(CH3): Deprecated. Remove on tock. diff --git a/cmake/GzConfigureProject.cmake b/cmake/GzConfigureProject.cmake index d10d1d48..c594d2a4 100644 --- a/cmake/GzConfigureProject.cmake +++ b/cmake/GzConfigureProject.cmake @@ -62,8 +62,8 @@ # Initialize the Gazebo project macro(gz_configure_project) # Define the expected arguments - set(options NO_PROJECT_PREFIX NO_IGNITION_PREFIX) # TODO(CH3): NO_IGNITION_PREFIX IS DEPRECATED. - set(oneValueArgs REPLACE_INCLUDE_PATH REPLACE_IGNITION_INCLUDE_PATH VERSION_SUFFIX) # TODO(CH3): REPLACE_IGNITION_INCLUDE_PATH IS DEPRECATED. + set(options NO_PROJECT_PREFIX) + set(oneValueArgs REPLACE_INCLUDE_PATH VERSION_SUFFIX) set(multiValueArgs CONFIG_EXTRAS) #------------------------------------ diff --git a/cmake/GzFindPackage.cmake b/cmake/GzFindPackage.cmake index 336bd098..1b1a74c6 100644 --- a/cmake/GzFindPackage.cmake +++ b/cmake/GzFindPackage.cmake @@ -198,36 +198,7 @@ macro(gz_find_package PACKAGE_NAME_) #------------------------------------ # Call find_package with the provided arguments - - # TODO(CH3): Deprecated. Remove on tock. - if(${PACKAGE_NAME} MATCHES "^Ign") - - # NOTE(CH3): Deliberately use QUIET since we expect Ign to fail - find_package(${${PACKAGE_NAME}_find_package_args} QUIET) - - if(NOT ${PACKAGE_NAME}_FOUND) - # Try Gz prepended version instead! - string(REGEX REPLACE "^Ign(ition)?" "Gz" PACKAGE_NAME_GZ ${PACKAGE_NAME}) - - set(${PACKAGE_NAME_GZ}_find_package_args ${${PACKAGE_NAME}_find_package_args}) - list(POP_FRONT ${PACKAGE_NAME_GZ}_find_package_args) - list(PREPEND ${PACKAGE_NAME_GZ}_find_package_args ${PACKAGE_NAME_GZ}) - - find_package(${${PACKAGE_NAME_GZ}_find_package_args}) - if(${PACKAGE_NAME_GZ}_FOUND) - - message(DEPRECATION "Ign prefixed package name [${PACKAGE_NAME}] is deprecated! Automatically using the Gz prefix instead: [${PACKAGE_NAME_GZ}]") - set(PACKAGE_NAME ${PACKAGE_NAME_GZ}) - - endif() - - endif() - else() - - # TODO(CH3): On removal on tock, unindent this and just have this line!! - find_package(${${PACKAGE_NAME}_find_package_args}) - - endif() + find_package(${${PACKAGE_NAME}_find_package_args}) #------------------------------------ diff --git a/cmake/GzImportTarget.cmake b/cmake/GzImportTarget.cmake index 3a5450dd..934df6d8 100644 --- a/cmake/GzImportTarget.cmake +++ b/cmake/GzImportTarget.cmake @@ -66,10 +66,6 @@ macro(gz_import_target package) set(target_name ${package}::${package}) endif() - if(${target_name} MATCHES "^Ign[^:]*::Ign") - message(DEPRECATION "Ign prefixed ${target_name} is deprecated (e.g. IgnOGRE::IgnOGRE)! Please use Gz prefix instead (e.g. GzOGRE::GzOGRE)") - endif() - if(NOT TARGET ${target_name}) #------------------------------------ @@ -93,27 +89,9 @@ macro(gz_import_target package) # against the variable package_LIBRARIES with the old-fashioned # target_link_libraries(mytarget ${package_LIBRARIES} if(NOT gz_import_target_INTERFACE) - # TODO(CH3): Remove Global upon deprecation. Remove it on hard-tock. - # It's needed to let the alias work! - add_library(${target_name} UNKNOWN IMPORTED GLOBAL) - - # TODO(CH3): Deprecated. Remove on tock. - if(${target_name} MATCHES "^Gz[^:]*::Gz") - string(REGEX REPLACE "^Gz" "Ign" alias_name ${target_name}) - string(REGEX REPLACE "::Gz" "::Ign" alias_name ${alias_name}) - add_library(${alias_name} ALIAS ${target_name}) - endif() + add_library(${target_name} UNKNOWN IMPORTED) else() - # TODO(CH3): Remove Global upon deprecation. Remove it on hard-tock. - # It's needed to let the alias work! - add_library(${target_name} INTERFACE IMPORTED GLOBAL) - - # TODO(CH3): Deprecated. Remove on tock. - if(${target_name} MATCHES "^Gz[^:]*::Gz") - string(REGEX REPLACE "^Gz" "Ign" alias_name ${target_name}) - string(REGEX REPLACE "::Gz" "::Ign" alias_name ${alias_name}) - add_library(${alias_name} ALIAS ${target_name}) - endif() + add_library(${target_name} INTERFACE IMPORTED) endif() # Do not bother with the IMPORTED_LOCATION or IMPORTED_IMPLIB variables if it diff --git a/cmake/GzPkgConfig.cmake b/cmake/GzPkgConfig.cmake index 8928870a..5fcdb769 100644 --- a/cmake/GzPkgConfig.cmake +++ b/cmake/GzPkgConfig.cmake @@ -128,7 +128,7 @@ macro(gz_pkg_check_modules_quiet package signature) # variable is blank, then we'll unset it from the CACHE to avoid # conflicts and confusion. # - # TODO(MXG): Consider giving a different prefix (e.g. IGN_PC_${package}) + # TODO(MXG): Consider giving a different prefix (e.g. GZ_PC_${package}) # to pkg_check_modules(~) so that the cached variables don't collide. That # would also help with the next TODO below. if(NOT ${package}_INCLUDE_DIRS) diff --git a/configure.bat b/configure.bat index 6b062700..022e7710 100644 --- a/configure.bat +++ b/configure.bat @@ -1,5 +1,5 @@ -:: NOTE: This script is only meant to be used as part of the ignition developers' CI system +:: NOTE: This script is only meant to be used as part of the Gazebo developers' CI system :: Users and developers should build and install this library using cmake and Visual Studio :: gz-cmake has no dependencies