Merge pull request #465 from robotology/rel0180

Remove deprecated module FindGLFW3 and variables YCM_VERSION_*

Author: traversaro

CMakeLists.txt

@@ -3,7 +3,7 @@
 
 
 cmake_minimum_required(VERSION 3.16)
-project(YCM VERSION 0.17.1 LANGUAGES NONE)
+project(YCM VERSION 0.18.0 LANGUAGES NONE)
 
 # Check if the project is the main project or included via FetchContent
 if (NOT CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
@@ -19,7 +19,6 @@ endif()
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/internal-modules")
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/modules")
 
-include(YCMVersion)
 include(YCMInternal)
 
 if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")

YCMConfig.cmake.in

@@ -11,20 +11,6 @@ set(YCM_VERSION @YCM_VERSION@)
 set(YCM_VERSION_MAJOR @YCM_VERSION_MAJOR@)
 set(YCM_VERSION_MINOR @YCM_VERSION_MINOR@)
 set(YCM_VERSION_PATCH @YCM_VERSION_PATCH@)
-set(YCM_VERSION_REVISION @YCM_VERSION_REVISION@)
-variable_watch(YCM_VERSION_REVISION _ycm_deprecated_variable_warning)
-set(YCM_VERSION_DATE @YCM_VERSION_DATE@)
-variable_watch(YCM_VERSION_DATE _ycm_deprecated_variable_warning)
-set(YCM_VERSION_DATE_REVISION @YCM_VERSION_DATE_REVISION@)
-variable_watch(YCM_VERSION_DATE_REVISION _ycm_deprecated_variable_warning)
-set(YCM_VERSION_API @YCM_VERSION_API@)
-variable_watch(YCM_VERSION_API _ycm_deprecated_variable_warning)
-set(YCM_VERSION_SHORT @YCM_VERSION_SHORT@)
-variable_watch(YCM_VERSION_SHORT _ycm_deprecated_variable_warning)
-set(YCM_VERSION_SOURCE @YCM_VERSION_SOURCE@)
-variable_watch(YCM_VERSION_SOURCE _ycm_deprecated_variable_warning)
-set(YCM_VERSION_DIRTY @YCM_VERSION_DIRTY@)
-variable_watch(YCM_VERSION_DIRTY _ycm_deprecated_variable_warning)
 
 @PACKAGE_INIT@
 

docs/CMakeLists.txt

@@ -52,7 +52,7 @@ set(conf_copyright "Copyright 2012-2021 Istituto Italiano di Tecnologia (IIT)")
 
 set(conf_docs "${YCM_SOURCE_DIR}/help")
 set(conf_path "${CMAKE_CURRENT_SOURCE_DIR}")
-set(conf_version "${YCM_VERSION_MAJOR}.${YCM_VERSION_MINOR}.${YCM_VERSION_TWEAK}")
+set(conf_version "${YCM_VERSION_MAJOR}.${YCM_VERSION_MINOR}.${YCM_VERSION_PATCH}")
 set(conf_release "${YCM_VERSION}")
 configure_file(conf.py.in conf.py @ONLY)
 

find-modules/CMakeLists.txt

@@ -10,7 +10,6 @@ set(YCM_FIND_MODULES FindACE.cmake
                      FindFreenect.cmake
                      FindFTDI.cmake
                      FindFuse.cmake
-                     FindGLFW3.cmake
                      FindGLM.cmake
                      FindGooCanvas.cmake
                      FindGooCanvasMM.cmake

find-modules/FindGLFW3.cmake

@@ -79,7 +79,6 @@ Find Package Modules
    /module/FindFreenect
    /module/FindFTDI
    /module/FindFuse
-   /module/FindGLFW3
    /module/FindGLM
    /module/FindGooCanvas
    /module/FindGooCanvasMM
@@ -146,17 +145,3 @@ These modules are patched versions of the ones included in CMake.
    /module/ExternalProject
    /module/CMakeParseArguments
 
-
-
-.. _`Deprecated Modules`:
-
-Deprecated Modules
-==================
-
-.. warning:: These modules are deprecated and should not be used in new code.
-
-.. toctree::
-   :maxdepth: 1
-
-   /module/FindGLUT
-   /module/YCMDefaultDirs

help/manual/ycm-modules.7.rst

@@ -9,11 +9,11 @@ set(CPACK_PACKAGE_VENDOR "Istituto Italiano di Tecnologia (IIT)")
 set(CPACK_PACKAGE_VERSION_MAJOR "${YCM_VERSION_MAJOR}")
 set(CPACK_PACKAGE_VERSION_MINOR "${YCM_VERSION_MINOR}")
 set(CPACK_PACKAGE_VERSION_PATCH "${YCM_VERSION_PATCH}")
-set(CPACK_PACKAGE_VERSION "${YCM_VERSION_SHORT}")
+set(CPACK_PACKAGE_VERSION "${YCM_VERSION}")
 
 set(CPACK_PACKAGE_DESCRIPTION_FILE "${YCM_SOURCE_DIR}/README.md")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Extra CMake Modules for YARP and friends")
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "robotology/ycm-${YCM_VERSION_API}")
+set(CPACK_PACKAGE_INSTALL_DIRECTORY "robotology/ycm-${YCM_VERSION_MAJOR}.${YCM_VERSION_MINOR}")
 set(CPACK_RESOURCE_FILE_LICENSE "${YCM_SOURCE_DIR}/LICENSE")
 set(CPACK_RESOURCE_FILE_WELCOME "${YCM_SOURCE_DIR}/tools/installer/welcome.txt")
 set(CPACK_PACKAGE_ICON "${YCM_SOURCE_DIR}/tools/installer/ycm.ico")
@@ -24,7 +24,7 @@ else()
   # Produce an installer for 64bit windows
   enable_language(C)
 
-  set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CPACK_PACKAGE_NAME} ${YCM_VERSION_API}")
+  set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CPACK_PACKAGE_NAME} ${YCM_VERSION_MAJOR}.${YCM_VERSION_MINOR}")
 
   # WIX settings
   set(CPACK_WIX_UPGRADE_GUID 9130C806-91AD-4CE4-8C3A-2476F71FEF77)